YunaiV b160d409f3 Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/yudao-cloud ... # Conflicts: # yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/admin/coupon/vo/template/CouponTemplateBaseVO.java # yudao-module-mall/yudao-module-statistics-biz/src/main/java/cn/iocoder/yudao/module/statistics/service/member/MemberStatisticsServiceImpl.java # yudao-module-system/yudao-module-system-biz/src/test/java/cn/iocoder/yudao/module/system/service/oauth2/OAuth2ApproveServiceImplTest.java # yudao-module-system/yudao-module-system-biz/src/test/java/cn/iocoder/yudao/module/system/service/oauth2/OAuth2ClientServiceImplTest.java # yudao-module-system/yudao-module-system-biz/src/test/java/cn/iocoder/yudao/module/system/service/oauth2/OAuth2CodeServiceImplTest.java		2024-08-31 09:51:54 +08:00
..
yudao-module-infra-api	Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/yudao-cloud	2024-07-20 17:58:19 +08:00
yudao-module-infra-biz	Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/yudao-cloud	2024-08-31 09:51:54 +08:00
pom.xml	初始化 spring cloud 项目的 system 和 infra 模块	2022-06-01 23:59:01 +08:00