-
Conflicts: yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/file/FileController.java yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/user/UserController.java yudao-ui-admin/src/components/ImageUpload/index.vue
-
2. 优化 trace 相关的逻辑
-
Conflicts: src/main/resources/application-local.yaml
-
Conflicts: src/main/resources/application.yaml
-
梳理 druid 的配置
-
Conflicts: pom.xml src/main/resources/application-local.yaml
-
Conflicts: src/main/java/cn/iocoder/dashboard/modules/system/enums/SysErrorCodeConstants.java
-
完成 YunpianSmsClient 的单元测试
