zn-cloud-wcs/yudao-module-mall
YunaiV cce77b8add Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/yudao-cloud
# Conflicts:
#	yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/history/ProductBrowseHistoryController.java
#	yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/app/social/AppSocialUserController.java
#	yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/service/wallet/PayWalletRechargeServiceImpl.java
#	yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/social/SocialClientApi.java
#	yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/socail/SocialClientController.java
#	yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/user/AdminUserServiceImpl.java
2024-08-02 08:48:59 +08:00
..
yudao-module-product-api Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/yudao-cloud 2024-01-19 22:55:28 +08:00
yudao-module-product-biz Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/yudao-cloud 2024-08-02 08:48:59 +08:00
yudao-module-promotion-api Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/yudao-cloud 2024-08-02 08:48:59 +08:00
yudao-module-promotion-biz Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/yudao-cloud 2024-08-02 08:48:59 +08:00
yudao-module-statistics-api ⬇️ 保持 JDK8 + Spring Boot 2.7.18 持续维护 2023-12-09 00:54:34 +08:00
yudao-module-statistics-biz 【代码代码】PAY:移除对 member 的依赖 2024-07-21 17:51:16 +08:00
yudao-module-trade-api Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/yudao-cloud 2024-08-02 08:48:59 +08:00
yudao-module-trade-biz Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/yudao-cloud 2024-08-02 08:48:59 +08:00
pom.xml statistics:初始化 2023-10-23 19:40:29 +08:00