6fc2cca9ef
# Conflicts: # blade-service/blade-transport/src/main/java/org/springblade/transport/mk/MkProcessBizHandlers.java # blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/ContractManageServiceImpl.java # blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/InvoiceApplicationServiceImpl.java # blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/InvoiceReceiptServiceImpl.java # blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/PaymentApplicationServiceImpl.java # blade-service/blade-transport/src/main/java/org/springblade/transport/task/CustomerKingdeeSyncTask.java # blade-service/blade-transport/src/main/java/org/springblade/transport/task/PaymentKingdeeResultTask.java # doc/nacos/blade.yaml # doc/nacos/third-party-api.yaml