-
Merge pull request !771 from 芋道源码/feature/crm
-
Merge pull request !769 from puhui999/feature/sub-table
-
Merge pull request !763 from zyna/feature/crm
-
Merge pull request !762 from puhui999/feature/crm
-
Merge pull request !765 from 芋道源码/feature/sub-table
-
Merge pull request !761 from puhui999/feature/sub-table
-
Merge pull request !764 from Ai3_刘小龙/N/A
-
Signed-off-by: Ai3_刘小龙 <wisty0317@163.com>
-
# Conflicts: # yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/customer/CrmCustomerService.java # yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/customer/CrmCustomerServiceImpl.java
-
Merge pull request !755 from zyna/feature/crm
-
Merge pull request !734 from puhui999/feature/sub-table
-
# Conflicts: # yudao-module-crm/yudao-module-crm-api/src/main/java/cn/iocoder/yudao/module/crm/enums/ErrorCodeConstants.java # yudao-module-crm/yudao-module-crm-biz/src/test/java/cn/iocoder/yudao/module/crm/service/business/BusinessStatusTypeServiceImplTest.java