-
# Conflicts: # sql/mysql/crm.sql
-
# Conflicts: # sql/mysql/ruoyi-vue-pro.sql # yudao-ui-admin/src/views/system/user/index.vue
-
Merge pull request !720 from 芋道源码/feature/dameng
-
【修改】规范命名：期数：indexNo-》period
-
# Conflicts: # sql/mysql/crm.sql
-
Merge pull request !695 from wanwan/feature/crm
-
2、商机状态类型和商机状态字段的处理；
-
# Conflicts: # sql/mysql/crm.sql # yudao-module-crm/yudao-module-crm-api/src/main/java/cn/iocoder/yudao/module/crm/enums/ErrorCodeConstants.java