YunaiV a9d91250f5 Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/yudao-cloud ... # Conflicts: # yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/brokerage/AppBrokerageUserController.java # yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/brokerage/BrokerageUserService.java # yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/brokerage/BrokerageUserServiceImpl.java # yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/app/social/AppSocialUserController.java # yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/social/SocialClientService.java # yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/social/SocialClientServiceImpl.java		2024-07-13 12:57:43 +08:00
..
src/main/java/cn/iocoder/yudao/module/promotion	Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/yudao-cloud	2024-07-13 12:57:43 +08:00
pom.xml	⬇️ 保持 JDK8 + Spring Boot 2.7.18 持续维护	2023-12-09 00:54:34 +08:00