YunaiV 0911d42e49 Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro ... # Conflicts: # yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/validation/InEnum.java # yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/validation/InEnumCollectionValidator.java # yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/validation/InEnumValidator.java # yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/admin/brokerage/BrokerageUserController.java # yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/auth/AuthController.java		2025-01-24 20:56:26 +08:00
..
yudao-module-erp-api	【代码优化】InEnum 不必须指定 int 类型，通过泛型指定	2025-01-24 17:31:41 +08:00
yudao-module-erp-biz	Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro	2024-12-19 21:27:52 +08:00
pom.xml	✨ ERP：初始化模块，立个 2024 年的 flag	2024-01-27 17:25:07 +08:00