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
..
main/java/cn/iocoder/yudao/module/product	Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro	2025-05-02 21:01:58 +08:00
test	Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/ruoyi-vue-pro	2024-04-10 20:58:35 +08:00