128 Commits (910bc09e197ed4d1568e023c4c9ecdbf1391d223)

Author SHA1 Message Date
zyna 910bc09e19 crm联系人商机功能 2 years ago
YunaiV 72969e921e crm: 增加基于客户查询回款计划分页 2 years ago
YunaiV f02b9464bd crm: 增加基于客户查询回款分页 2 years ago
YunaiV db03b10d24 crm: 增加基于客户查询商机分页 2 years ago
YunaiV 2d9f5cc4d0 crm: 1)调整合同的 CRM 前缀;2)增加基于客户查询合同分页 2 years ago
YunaiV fe4b51b9ad crm: 完善数据权限的逻辑 2 years ago
YunaiV 53b8e37f36 crm: 增加联系人,基于客户的读取接口 2 years ago
YunaiV 1a93e3a110 crm:code review 联系人 2 years ago
芋道源码 591bc36737
!763 crm联系人review修改
Merge pull request !763 from zyna/feature/crm
2 years ago
YunaiV 36a51b68d9 crm:code review 数据权限 2 years ago
puhui999 79600774ec crm-客户:分页查询 mapper 还是得拆成两个,怎么查逻辑交给 service 去做处理 2 years ago
zyna 1580789334 crm联系人review修改 2 years ago
puhui999 6c536caad4 crm:完善 code review 数据权限提到的问题 2 years ago
YunaiV 492adfe8e5 crm:code review 数据权限 2 years ago
YunaiV 455f8e49fb crm:code review 联系人 2 years ago
zyna 16084d468d crm联系人删除多余文件 2 years ago
zyna 3f3899f5d3 crm联系人review修改,新增地区字段 2 years ago
puhui999 4a51b20155 crm-客户:修复合并差异 2 years ago
puhui999 f87d73724b Merge remote-tracking branch 'yudao/feature/crm' into feature/crm
# 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
2 years ago
puhui999 8f06d02293 crm-客户:完善 code review 提到的问题 2 years ago
puhui999 7f569f3299 crm-数据权限:完善数据权限 2 years ago
YunaiV f766474ff4 crm:code review 客户配置 2 years ago
Wanwan fbf864b6b4 fix: 修复客户公海配置设置为不启用时保存字段没有清空的 bug 2 years ago
Wanwan 033f13c6ad feat: 客户配置 review 修改 2 years ago
Wanwan ab3748d102 feat: 客户配置 review 修改 2 years ago
YunaiV 63f9bcb0a3 crm:code review 商机类型、状态 2 years ago
YunaiV 3e9eb59de3 crm:code review 数据权限的实现 2 years ago
YunaiV 899e40deb9 crm:code review 数据权限的实现 2 years ago
YunaiV d1579499f4 Merge remote-tracking branch 'ljlleo/feature/crm' into feature/crm
# Conflicts:
#	yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/business/CrmBusinessController.java
#	yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/dal/mysql/customer/CrmCustomerMapper.java
#	yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/customer/CrmCustomerServiceImpl.java
2 years ago
YunaiV 8e480162c4 Merge remote-tracking branch 'origin/feature/crm' into feature/crm
# Conflicts:
#	yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/dal/mysql/customer/CrmCustomerMapper.java
#	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
2 years ago
YunaiV 13e5d70be7 crm:解决冲突 2 years ago
YunaiV ec67e63c67 crm:code review 客户的公海领取和分配 2 years ago
YunaiV 1842549634 crm:code review 客户的公海领取和分配 2 years ago
ljlleo 4e1d9d6292 商机、商机状态类型和商机状态 2 years ago
puhui999 0d821d705d crm-客户管理:完善客户、公海客户分页查询 2 years ago
puhui999 b41d469d46 crm-客户管理:新增客户放入公海和领取公海客户 2 years ago
puhui999 77d7bcc73f crm-数据权限:完善数据权限 code review 提到的问题 2 years ago
puhui999 780526f484 crm-数据权限:完善数据权限相关操作接口 2 years ago
xiaqing 87778f7fd9 客户的公海领取和分配,按照要修调整代码格式 2 years ago
YunaiV f589881de5 code review:客户的分配和领取 2 years ago
YunaiV e519b41244 Merge branch 'feature/crm' of https://gitee.com/SummerQing/ruoyi-vue-pro into feature/crm
# 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/main/java/cn/iocoder/yudao/module/crm/controller/admin/customer/CrmCustomerController.java
#	yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/customer/CrmCustomerServiceImpl.java
2 years ago
YunaiV 86050d411b code review:权限模块 2 years ago
YunaiV 716b081464 crm:合并最新的数据权限 2 years ago
YunaiV 8c9873c425 Merge branch 'feature/crm' of https://gitee.com/puhui999/ruoyi-vue-pro into feature/crm
# Conflicts:
#	yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/customer/CrmCustomerController.java
#	yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/convert/contact/ContactConvert.java
#	yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/convert/customer/CrmCustomerConvert.java
#	yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/contact/ContactServiceImpl.java
#	yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/customer/CrmCustomerServiceImpl.java
#	yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/convert/dept/PostConvert.java
2 years ago
YunaiV 8c9c91f0ca crm:code review 配置管理 2 years ago
YunaiV 90f135ad95 Merge branch 'feature/crm' of https://gitee.com/jiangwanwan/ruoyi-vue-pro into feature/crm
# Conflicts:
#	sql/mysql/crm.sql
2 years ago
YunaiV 966690125b crm:code review 联系人 2 years ago
puhui999 794649ea8a CRM-数据权限:完善团队成员相关操作 2 years ago
Wanwan 322411304c feat: CRM 客户限制 2 years ago
zyna 7598ed05cf crm联系人第二版新增字段 2 years ago