-
Conflicts: yudao-module-mall/yudao-module-trade-biz/pom.xml
-
Conflicts: sql/optional/mall/mall.sql
-
Merge pull request !246 from xingyu/master
-
Merge pull request !260 from FinalFinancialFreedom/N/A
-
Signed-off-by: FinalFinancialFreedom <li.acerphoenix@gmail.com>
-
Conflicts: README.md yudao-framework/pom.xml yudao-framework/yudao-spring-boot-starter-biz-error-code/pom.xml yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/swagger/config/YudaoSwaggerAutoConfiguration.java yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/framework/security/config/SecurityConfiguration.java
-
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
-
Conflicts: sql/ruoyi-vue-pro.sql yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue/views/index.vue.vm
-
导出最新的 SQL 脚本
-
- ImageUpload 组件回调 url 处理
-
- 前端 ImageUpload 组件, 上传路径以及地址拼接 - 基础设施-文件上传, 新增简单上传接口
