YunaiV 5d3bb791fd Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro ... # Conflicts: # yudao-module-mall/yudao-module-trade-biz/src/test/java/cn/iocoder/yudao/module/trade/service/order/TradeOrderUpdateServiceTest.java # yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/permission/MenuServiceImpl.java		2024-07-07 09:14:36 +08:00
..
yudao-module-member-api	Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/ruoyi-vue-pro	2024-01-19 09:13:18 +08:00
yudao-module-member-biz	Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro	2024-07-07 09:14:36 +08:00
pom.xml	1. 【修复】单元测试报错	2022-04-22 00:07:54 +08:00