-
# Conflicts: # yudao-module-crm/yudao-module-crm-biz/src/test/java/cn/iocoder/yudao/module/crm/service/contract/ContractServiceImplTest.java # yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dict/DictDataController.java
-
Merge pull request !776 from ZanGe丶/feature/crm
-
Merge pull request !783 from 芋道源码/feature/vo-optimize
-
Merge pull request !774 from 芋道源码/feature/vo-optimize
-
Merge pull request !771 from 芋道源码/feature/crm