-
# Conflicts: # yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/service/file/FileServiceImpl.java
-
Merge pull request !211 from 圆梦巨人/feature/cache-list
-
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-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"的格式，解决控制台报错
