-
Merge pull request !875 from puhui999/develop
-
# Conflicts: # yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/business/vo/business/CrmBusinessSaveReqVO.java # yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/business/CrmBusinessServiceImpl.java
-
Merge pull request !871 from dhb52/develop
-
Merge pull request !870 from dhb52/develop
-
# Conflicts: # yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/contract/CrmContractService.java
-
Merge pull request !865 from 疯狂的世界/develop
-
# Conflicts: # yudao-module-erp/yudao-module-erp-biz/src/test/java/cn/iocoder/yudao/module/erp/service/product/ErpProductUnitServiceImplTest.java
-
Merge pull request !866 from 安浩浩/develop
-
Merge pull request !868 from dhb52/develop