YunaiV 95edd1d451 Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into master-redis ...

 Conflicts:

	yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/convert/auth/AuthConvert.java

	yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/permission/MenuServiceImpl.java

2023-07-28 22:31:18 +08:00

..

yudao-module-system-api

对齐 boot 与 cloud 的代码

2023-07-27 13:59:29 +08:00

yudao-module-system-biz

Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into master-redis

2023-07-28 22:31:18 +08:00

pom.xml

1. 【修复】单元测试报错

2022-04-22 00:07:54 +08:00