168 Commits (main)

Author SHA1 Message Date
YunaiV 9b7f6cfbac 📖 CRM:线索的 code review 2 years ago
芋道源码 4ca1f72d4f
!829 CRM:【线索】
Merge pull request !829 from Minh-X/develop
2 years ago
dhb52 4558ecd836 wip: 待办事项 2 years ago
lzxhqs f361d05940 商机模块 2 years ago
puhui999 73c459f360 完善更进 2 years ago
min 2de0fb48ea CRM:【线索】 线索如果不存在或者已经转化,抛出异常 2 years ago
puhui999 eaa8e4be96 操作日志字段解析方法调整 2 years ago
芋道源码 19c0227cef
!826 CRM 产品分类和产品,优化了操作日志 ,新增获得产品操作日志
Merge pull request !826 from 安浩浩/develop
2 years ago
YunaiV e79c750b46 📖 CRM:code review 跟进记录的实现 2 years ago
anhaohao 803816b162 修改:CRM 产品分类和产品,优化了操作日志 2 years ago
puhui999 6b426fcd01 CRM: 修复一下差异 2 years ago
puhui999 19fa65b0c3 CRM: 新增跟进记录 2 years ago
puhui999 ba103d6e86 CRM: 完善一些 TODO 提到的问题 2 years ago
puhui999 1a5fe6fa9a CRM: 完善客户、联系人、合同、回款计划、回款的操作日志 2 years ago
puhui999 9bba1ce8a4 新增 ParseFunctionNameConstants 常量枚举 2 years ago
YunaiV 772b794374 📖 CRM:code review CRM 产品分类 2 years ago
anhaohao 4afff6185e 新增:CRM 产品分类和产品,接入操作日志,数据权限控制 2 years ago
芋道源码 3c7f63c356
!810 fix:修复 issues 提到的一些公众号上的问题
Merge pull request !810 from puhui999/develop
2 years ago
YunaiV 19d5a0c2aa 📖 CRM:code review crm 联系人新增操作日志 2 years ago
zyna 44d828023c crm联系人新增操作日志 2 years ago
puhui999 3170e7fd97 CRM-客户: 简化客户公海配置 VO,完善相关操作日志 2 years ago
puhui999 269816446a CRM-客户:日志表达式调整 2 years ago
puhui999 a1c17b9b00 CRM-客户:日志表达式调整 2 years ago
puhui999 d8bb55fc0b CRM-客户:完善操作日志 2 years ago
YunaiV d0df0e8e16 📖 CRM:【客户】优化锁定客户的逻辑实现 2 years ago
YunaiV 0253846fdf Merge branch 'develop' of https://gitee.com/zh8790/ruoyi-vue-pro_develop into develop
# Conflicts:
#	yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/customer/CrmCustomerServiceImpl.java
2 years ago
YunaiV 9e3055ee1e 📖 CRM:code review 商机模块 2 years ago
YunaiV 2d0537387b Merge branch 'develop' of https://gitee.com/zyna/ruoyi-vue-pro into develop
# Conflicts:
#	yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/contact/CrmContactBusinessLinkServiceImpl.java
2 years ago
YunaiV 8c9b483ac5 📖 code review 操作日志的实现 2 years ago
puhui999 3e91ac73c4 CRM:完善数据分页查询条件构造 CrmQueryWrapperUtils 2 years ago
puhui999 3bab9748db 系统操作日志:使用自定义 starter 的方式重新集成 mzt-biz-log 2 years ago
zyna bd76ea59a7 Merge remote-tracking branch 'origin/feature/crm' into develop
# 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/controller/admin/contact/CrmContactController.java
#	yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/contactbusinesslink/CrmContactBusinessLinkController.java
#	yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/business/CrmBusinessService.java
#	yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/business/CrmBusinessServiceImpl.java
#	yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/contact/CrmContactBusinessLinkServiceImpl.java
#	yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/contact/CrmContactServiceImpl.java
2 years ago
zyna 8434a8cd68 crm联系人商机功能修改 2 years ago
YunaiV ddb6fe7ec8 📖 CRM:code review 客户管理的数据权限、操作权限 2 years ago
puhui999 3c74b22933 系统操作日志:集成 mzt-biz-log 4 2 years ago
puhui999 c74881c8f0 系统操作日志:集成 mzt-biz-log 3 2 years ago
puhui999 c5cc818a49 系统操作日志:集成 mzt-biz-log 2 years ago
puhui999 1ac68aca97 CRM-回款计划:添加数据权限 2 years ago
puhui999 e4d3175f06 CRM-数据权限:完善 review 提到的问题 2 years ago
Joey 9bac10c6f7 完善客户锁定/解锁接口,校验锁定上限 2 years ago
YunaiV 23df8633f4 📖 CRM:code review 数据权限的实现 2 years ago
puhui999 5c395fc1c4 CRM: 完善 code review 数据权限提到的问题,重新封装 CrmQueryWrapperUtils 2 years ago
YunaiV 3707662187 📈 CRM:code review 数据权限 2 years ago
YunaiV d430063eec Merge remote-tracking branch 'puhui/feature/crm' into feature/crm
# Conflicts:
#	yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/api/user/AdminUserApiImpl.java
2 years ago
芋道源码 21a3870c00
!775 crm联系人商机功能
Merge pull request !775 from zyna/feature/crm
2 years ago
YunaiV a11d5dc5f1 🔨 CRM:优化产品代码的实现 2 years ago
puhui999 d59d1428d7 Merge remote-tracking branch 'yudao/feature/crm' into feature/crm 2 years ago
芋道源码 c463f831f4
!776 【CRM:优化产品以及产品分类】
Merge pull request !776 from ZanGe丶/feature/crm
2 years ago
puhui999 78165f2161 CRM: 新增 CRM 分页查询工具类,实现通用构造 crm 数据类型数据分页查询条件 2 years ago
puhui999 9c1687dc25 CRM: 新增关注数据模块 2 years ago
ZanGe丶 d2e965fb02 【CRM:优化产品以及产品分类】 2 years ago
zyna 910bc09e19 crm联系人商机功能 2 years ago
YunaiV f02b9464bd crm: 增加基于客户查询回款分页 2 years ago
YunaiV 2d9f5cc4d0 crm: 1)调整合同的 CRM 前缀;2)增加基于客户查询合同分页 2 years ago
YunaiV fe4b51b9ad crm: 完善数据权限的逻辑 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
YunaiV f766474ff4 crm:code review 客户配置 2 years ago
Wanwan ab3748d102 feat: 客户配置 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
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
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 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
Wanwan 5b295d56b6 feat: CRM 客户限制 2 years ago
Wanwan 2915b46fa5 feat: CRM 客户公海配置 2 years ago
puhui999 f4c92089e5 CRM-客户:添加分页数据场景过滤 2 years ago
xiaqing 645fe827a3 Merge remote-tracking branch 'origin/feature/crm' into feature/crm 2 years ago
xiaqing b06432b8f8 增加客户的公海领取和分配 2 years ago
ZanGe丶 bf42f8e9ff 【增加CRM:产品以及产品分类】 2 years ago
芋道源码 9ee6a27b86
!715 feat: 客户详情 + review 修改
Merge pull request !715 from wanwan/feature/crm
2 years ago
Wanwan 64db1a9c90 feat: 客户详情 + review 修改 2 years ago
YunaiV b7900c2035 code review:回款逻辑 2 years ago
芋道源码 71ce831d59
!706 完善回款管理和回款计划功能
Merge pull request !706 from souvc/feature/crm
2 years ago
puhui999 23cfbfe491 CRM-数据权限:完善数据团队操作-添加、编辑、移除团队成员,退出团队 2 years ago
puhui999 c6422dc657 完善 CRM-客户 数据权限校验2 2 years ago
liuhongfeng f1f180ff77 【新增】字典归类
【修改】规范实体命名和字段类型修改
2 years ago
liuhongfeng 798dd3269f Merge branch 'feature/crm' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/crm 2 years ago
zhijiantianya@gmail.com 4dab376ca9 code review:数据权限的实现 2 years ago
puhui999 e6eaa3a24a 完善 CRM-数据权限校验方式 2 years ago
puhui999 19c9b6ae93 新增 CRM-数据权限 service 2 years ago
puhui999 bec8a27a21 新增 CRM-数据权限 注解实现 2 years ago
liuhongfeng fc087fa252 Merge branch 'feature/crm' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/crm 2 years ago
YunaiV 67ac11b56c code review:crm 客户转移 2 years ago
liuhongfeng 9608cf0539 Merge branch 'feature/crm' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/crm 2 years ago
liuhongfeng 677e8ab2fc 【修改】回款计划-修改字段类型
【修改】修改回款计划-创建逻辑,添加客户的数据校验
2 years ago
芋道源码 f73b857551
!702 CRM【商机】【联系人】【合同】新增 transfer 接口
Merge pull request !702 from puhui999/feature/crm
2 years ago
YunaiV fe50356ae8 code review:crm 客户模块的实现 2 years ago
puhui999 722e9c8a04 CRM-商机:新增商机转移接口 2 years ago
puhui999 36a76c5ce6 CRM-联系人:新增联系人转移接口 2 years ago
puhui999 d9f6fb241a 合同:新增合同转移接口 2 years ago
Wanwan 3af9688383 feat: 调整客户表的字段 2 years ago
liuhongfeng b0ddd522fb Merge branch 'feature/crm' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/crm 2 years ago