-
Conflicts: yudao-admin-server/pom.xml yudao-dependencies/pom.xml yudao-user-server/src/main/resources/application-dev.yaml yudao-user-server/src/main/resources/application-local.yaml
-
Conflicts: yudao-core-service/src/main/java/cn/iocoder/yudao/coreservice/modules/system/enums/SysErrorCodeConstants.java
-
2. 修复 mvn package 报错问题
-
Conflicts: 更新日志.md
-
同时,收到支付结果时,立马回调业务,避免延迟
-
2. 增加创建支付单的 Service 实现
-
Merge pull request !44 from 芋道源码/feature/user-admin-server
-
Conflicts: src/main/resources/application-local.yaml
-
Conflicts: pom.xml src/main/resources/application-local.yaml