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 |
|
Wanwan
|
5b295d56b6
|
feat: CRM 客户限制
|
2 years ago |
|
Wanwan
|
2915b46fa5
|
feat: CRM 客户公海配置
|
2 years ago |
|
puhui999
|
f4c92089e5
|
CRM-客户：添加分页数据场景过滤
|
2 years ago |
|
puhui999
|
388e07c834
|
CRM：完善模块数据放入公海、公海数据领取
|
2 years ago |
|
puhui999
|
533b7295ab
|
Merge remote-tracking branch 'yudao/feature/crm' into feature/crm
|
2 years ago |
|
puhui999
|
c8ed99a5a4
|
CRM-客户：完善客户详情、分页、公海数据获取
|
2 years ago |
|
xiaqing
|
18de22dc39
|
增加客户的公海领取和
|
2 years ago |
|
xiaqing
|
645fe827a3
|
Merge remote-tracking branch 'origin/feature/crm' into feature/crm
|
2 years ago |
|
xiaqing
|
b06432b8f8
|
增加客户的公海领取和分配
|
2 years ago |
|
Wanwan
|
71574da2cf
|
feat: CRM 客户公海配置
|
2 years ago |
|
Wanwan
|
4235beec3b
|
Merge remote-tracking branch 'origin/feature/crm' into feature/crm
|
2 years ago |
|
puhui999
|
668fae9398
|
CRM-数据权限：完善 code review 提到的问题
|
2 years ago |
|
Wanwan
|
a24919e555
|
style: 客户 review 修改
|
2 years ago |
|
YunaiV
|
8efdf3141a
|
code review：crm 商品逻辑
|
2 years ago |
ZanGe丶
|
bf42f8e9ff
|
【增加CRM：产品以及产品分类】
|
2 years ago |
|
YunaiV
|
ecf728966f
|
code review：客户逻辑
|
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
|
acdfc28ee6
|
code review：客户锁定的逻辑
|
2 years ago |
|
芋道源码
|
9a007de947
|
!713 新增接口
Merge pull request !713 from Joey/feature/crm
|
2 years ago |
|
YunaiV
|
b7900c2035
|
code review：回款逻辑
|
2 years ago |
Joey
|
0a58790c6b
|
新增客户锁定和解锁 接口
|
2 years ago |
|
芋道源码
|
71ce831d59
|
!706 完善回款管理和回款计划功能
Merge pull request !706 from souvc/feature/crm
|
2 years ago |
|
zhijiantianya@gmail.com
|
4092f298ed
|
code review：crm 权限模块的实现
|
2 years ago |
|
puhui999
|
68c9d563bc
|
CRM-商机：新增获得商机公海分页接口
|
2 years ago |
|
puhui999
|
23cfbfe491
|
CRM-数据权限：完善数据团队操作-添加、编辑、移除团队成员，退出团队
|
2 years ago |
|
puhui999
|
7a8ffd9ccb
|
CRM-商机：完善获取权限过滤后的分页数据
|
2 years ago |
|
puhui999
|
91dd61edc0
|
完善 review 提到的问题
|
2 years ago |
|
puhui999
|
a385a37c4a
|
完善 CRM-客户 数据权限校验2
|
2 years ago |
|
puhui999
|
c6422dc657
|
完善 CRM-客户 数据权限校验2
|
2 years ago |
liuhongfeng
|
95e9dc81c9
|
【修改】回款计划和回款管理统一带上Crm前缀，防止和其他模块冲突。
|
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 |
|
liuhongfeng
|
921c2ab757
|
【新增】负责人
【修改】规范命名：期数：indexNo-》period
|
2 years ago |
|
zhijiantianya@gmail.com
|
4dab376ca9
|
code review：数据权限的实现
|
2 years ago |
|
puhui999
|
c2fd817989
|
完善 CRM-客户 数据权限校验
|
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
|
d1978d318b
|
code review：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 |
|
Wanwan
|
c18f5baa4b
|
feat: 调整客户表的字段
|
2 years ago |
|
liuhongfeng
|
b0ddd522fb
|
Merge branch 'feature/crm' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/crm
|
2 years ago |
|
liuhongfeng
|
301f497527
|
【新增】回款计划-审批枚举类
【新增】回款计划-回款方式枚举类
【新增】回款计划-枚举类校验
【修改】回款计划-错误码调整
【修改】修改回款计划-创建逻辑，添加合同数据的校验
|
2 years ago |
|
YunaiV
|
81b6aebf47
|
code review：商机表的实现
|
2 years ago |
|
YunaiV
|
bf247a6626
|
Merge branch 'feature/crm' of https://gitee.com/ljlleo/ruoyi-vue-pro into feature/crm
# Conflicts:
# sql/mysql/crm.sql
|
2 years ago |
|
YunaiV
|
74f786f8ed
|
code review：客户表的实现
|
2 years ago |
|
ljlleo
|
75115bcc48
|
1、商机前端页面；
2、商机状态类型和商机状态字段的处理；
|
2 years ago |
|
Wanwan
|
866eaedfeb
|
feat: 客户表的 crud
|
2 years ago |
|
Wanwan
|
04613af0cd
|
feat: 客户表的 crud
|
2 years ago |
|
YunaiV
|
55f9e0131c
|
code review：CRM 客户联系人的管理
|
2 years ago |
|
YunaiV
|
723707c7ed
|
Merge branch 'feature/crm' of https://gitee.com/zyna/ruoyi-vue-pro into feature/crm
# Conflicts:
# sql/mysql/crm.sql
# yudao-module-crm/yudao-module-crm-api/src/main/java/cn/iocoder/yudao/module/crm/enums/ErrorCodeConstants.java
|
2 years ago |
|
YunaiV
|
b5560fa0be
|
code review：CRM 线索表的逻辑
|
2 years ago |
|
YunaiV
|
9cf4cfca86
|
Merge branch 'feature/crm' of https://gitee.com/jiangwanwan/ruoyi-vue-pro into feature/crm
# Conflicts:
# sql/mysql/crm.sql
|
2 years ago |
|
YunaiV
|
f942e2c7f2
|
code review：CRM 回款计划的逻辑
|
2 years ago |
|
YunaiV
|
56b59cf383
|
Merge branch 'feature/crm' of https://gitee.com/souvc/ruoyi-vue-pro into feature/crm
# Conflicts:
# sql/mysql/crm.sql
# sql/mysql/crm_menu.sql
# yudao-module-crm/yudao-module-crm-api/src/main/java/cn/iocoder/yudao/module/crm/enums/ErrorCodeConstants.java
|
2 years ago |
|
YunaiV
|
6f8fd383f7
|
code review：CRM 商机的逻辑
|
2 years ago |
|
913752709@qq.com
|
e4eeaa1d69
|
feat: crm 线索表完善 review 提到的问题
|
2 years ago |
|
liuhongfeng
|
34a5785768
|
【新增】回款计划 功能
|
2 years ago |
|
zyna
|
e4943f0dfa
|
crm联系人
|
2 years ago |
|
liuhongfeng
|
73f4fc8ceb
|
【新增】回款管理 功能
|
2 years ago |
|
ljlleo
|
bee6f41211
|
商机
|
2 years ago |
|
YunaiV
|
439edcd1be
|
code review：crm 线索的 crud
|
2 years ago |
|
wanwan
|
48661f980c
|
!679 feat: CRM 线索表 crud
* feat: CRM 线索表 crud
* feat: CRM 线索表 crud
|
2 years ago |
|
YunaiV
|
b133acd8cd
|
code review：crm 合同流程
|
2 years ago |
dhb52
|
164be5732b
|
feat: CRM/合同管理 - SQL
|
2 years ago |
|
dhb52
|
eedb528412
|
feat: CRM/合同管理 - crud
|
2 years ago |
|
dhb52
|
e26bd20a5b
|
feat:添加测试配置及excel依赖
|
2 years ago |
|
YunaiV
|
7e312aae02
|
初始化 crm 模块
|
2 years ago |