 刘泉佳
|
cae284483e
|
Merge remote-tracking branch 'origin/master' into feature/payment-apply-bfi-sync
# Conflicts:
# blade-common/src/main/java/org/springblade/common/config/BladeCommonConfiguration.java
# blade-service-api/blade-system-api/src/main/java/org/springblade/system/feign/ISysClient.java
# blade-service-api/blade-system-api/src/main/java/org/springblade/system/feign/ISysClientFallback.java
# blade-service/blade-system/src/main/java/org/springblade/system/feign/SysClient.java
# blade-service/blade-transport/pom.xml
# blade-service/blade-transport/src/main/java/org/springblade/transport/mapper/CustomerArchiveMapper.xml
# blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/PaymentApplicationServiceImpl.java
# blade-service/blade-transport/src/main/java/org/springblade/transport/wrapper/PaymentApplicationWrapper.java
# blade-service/blade-transport/src/main/resources/application-dev.yml
# blade-third-party-api/pom.xml
# doc/nacos/blade-dev.yaml
# doc/nacos/blade-prod.yaml
# doc/nacos/third-party-api.yaml
# pom.xml
|
2026-09-24 03:15:30 +08:00 |
|
b2894lxlx