ShiShiYiBan/yudao-module-mall
YunaiV a557f0733f Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
# Conflicts:
#	yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/api/file/FileApiImpl.java
#	yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/service/file/FileServiceImpl.java
#	yudao-module-infra/yudao-module-infra-biz/src/test/java/cn/iocoder/yudao/module/infra/service/file/FileServiceImplTest.java
#	yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/app/coupon/vo/template/AppCouponTemplateRespVO.java
#	yudao-module-member/yudao-module-member-biz/src/test/java/cn/iocoder/yudao/module/member/service/user/MemberUserServiceImplTest.java
#	yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/user/AdminUserService.java
#	yudao-module-system/yudao-module-system-biz/src/test/java/cn/iocoder/yudao/module/system/service/user/AdminUserServiceImplTest.java
2025-05-02 21:01:58 +08:00
..
yudao-module-product-api Merge branch 'develop' of https://gitee.com/zhijiantianya/ruoyi-vue-pro 2025-04-30 00:11:24 +08:00
yudao-module-product-biz Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro 2025-05-02 21:01:58 +08:00
yudao-module-promotion-api Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro 2025-01-24 20:56:26 +08:00
yudao-module-promotion-biz Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro 2025-05-02 21:01:58 +08:00
yudao-module-statistics-api 【代码优化】InEnum 不必须指定 int 类型,通过泛型指定 2025-01-24 17:31:41 +08:00
yudao-module-statistics-biz 【代码优化】增强 JDK17、JDK8 之间的兼容性 2024-08-26 12:37:33 +08:00
yudao-module-trade-api 【代码优化】InEnum 不必须指定 int 类型,通过泛型指定 2025-01-24 17:31:41 +08:00
yudao-module-trade-biz 【同步】jdk21 和 jdk8 的代码 2025-04-30 09:45:18 +08:00
pom.xml 商城:增加 stat 统计设计 2023-09-27 19:14:32 +08:00