BJ_ZTEITS-Developers / parking-cloud-yudao

# Conflicts:
#	yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/customer/CrmCustomerController.java
#	yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/receivable/CrmReceivableServiceImpl.java

1. 优化订单管理的接口实现
2. 支付状态增加 refund 类型，将 refund status 合并进去

2. 优化 trace 相关的逻辑

 Conflicts:
	src/main/resources/application-local.yaml

 Conflicts:
	src/main/resources/application.yaml