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
..
java/cn/iocoder/yudao/framework/quartz	Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro	2024-07-07 09:14:36 +08:00
resources/META-INF/spring	feat: 适配 springboot 2.7	2022-11-30 01:03:56 +08:00