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
..
src	Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/yudao-cloud	2024-08-02 08:48:59 +08:00
Dockerfile	Update Dockerfile base image to 8-jre	2023-12-30 11:28:19 +08:00
pom.xml	Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/yudao-cloud	2024-07-14 19:16:25 +08:00