YunaiV c239d9cc56 Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into develop ... # Conflicts: # yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/app/kefu/AppKeFuMessageController.java # yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/convert/combination/CombinationActivityConvert.java		2024-11-19 09:26:44 +08:00
..
yudao-module-pay-api	Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into develop	2024-11-19 09:26:44 +08:00
yudao-module-pay-biz	Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into develop	2024-11-19 09:26:44 +08:00
yudao-spring-boot-starter-biz-pay	Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into develop	2024-11-19 09:26:44 +08:00
pom.xml	✨ 全局：迁移 pay 组件到 pay 模块，迁移 flowable 组件到 bpm 模块	2024-02-28 21:03:40 +08:00