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
..
yudao-module-crm-api	【增强】一键改包：支持 site、org 等包	2024-04-29 12:48:46 +08:00
yudao-module-crm-biz	Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/yudao-cloud	2024-07-13 12:57:43 +08:00
pom.xml	✨ 增加 CRM 模块	2024-02-17 23:25:41 +08:00