-
Conflicts: yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/auth/MemberAuthServiceImpl.java
-
Merge pull request !199 from DoNow/master
-
Merge pull request !205 from muyi/login
-
修复部分svg图标引用草料二维码插件内部字体的问题 去除短信日志页面的新增按钮，解决"handleAdd" is not defined的报错 修复数据库文档页面中data定义src: "undefined"的格式，解决控制台报错
-
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
