-
Conflicts: yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/auth/MemberAuthServiceImpl.java
-
Merge pull request !186 from 谢谢的谢/master
-
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
-
Merge pull request !167 from hezhenhui/#I578CG
-
Merge pull request !166 from 芋道源码/feature/1.6.2
-
Conflicts: sql/ruoyi-vue-pro.sql yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue/views/index.vue.vm
-
(cherry picked from commit 974cef3a534ae575422c75ab5a04b272d18a6b14)
-
Merge pull request !135 from dearliuliu0522/dev
-
1. 适配表名是大写的情况 2. 优化代码生成器的校验逻辑
-
1. 修复配置中心的 DAO 查询报错 2. 适配 LIMIT 1 的查询
-
1. 去除关键字，避免数据库的查询冲突
-
2. 修复单元测试的报错
-
2. 完善 Oracle 的字段映射