fuhao
/
ciqihuo-video-approve
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
5,606 Commits 2 Branches 0 Tags 169 MiB
Commit Graph

101 Commits

Author SHA1 Message Date
YunaiV 899e40deb9 crm：code review 数据权限的实现 2023-11-25 10:02:55 +08:00
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
 2023-11-24 23:58:49 +08:00
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
 2023-11-24 23:55:10 +08:00
YunaiV 13e5d70be7 crm：解决冲突 2023-11-24 23:54:23 +08:00
YunaiV ec67e63c67 crm：code review 客户的公海领取和分配 2023-11-24 23:53:28 +08:00
YunaiV 1842549634 crm：code review 客户的公海领取和分配 2023-11-24 23:11:58 +08:00
ljlleo 4e1d9d6292 商机、商机状态类型和商机状态 2023-11-24 14:24:04 +08:00
puhui999 0d821d705d crm-客户管理：完善客户、公海客户分页查询 2023-11-23 10:12:50 +08:00
puhui999 b41d469d46 crm-客户管理：新增客户放入公海和领取公海客户 2023-11-22 18:44:49 +08:00
puhui999 77d7bcc73f crm-数据权限：完善数据权限 code review 提到的问题 2023-11-22 17:56:13 +08:00
puhui999 780526f484 crm-数据权限：完善数据权限相关操作接口 2023-11-22 17:27:00 +08:00
xiaqing 87778f7fd9 客户的公海领取和分配，按照要修调整代码格式 2023-11-19 23:23:52 +08:00
YunaiV f589881de5 code review：客户的分配和领取 2023-11-19 00:05:06 +08:00
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
 2023-11-18 23:56:08 +08:00
YunaiV 86050d411b code review：权限模块 2023-11-18 23:45:24 +08:00
YunaiV 716b081464 crm：合并最新的数据权限 2023-11-18 22:31:05 +08:00
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
 2023-11-18 22:25:13 +08:00
YunaiV 8c9c91f0ca crm：code review 配置管理 2023-11-18 22:12:12 +08:00
YunaiV 90f135ad95 Merge branch 'feature/crm' of https://gitee.com/jiangwanwan/ruoyi-vue-pro into feature/crm 
# Conflicts:
#	sql/mysql/crm.sql
 2023-11-18 21:17:11 +08:00
YunaiV 966690125b crm：code review 联系人 2023-11-18 20:43:32 +08:00
puhui999 794649ea8a CRM-数据权限：完善团队成员相关操作 2023-11-14 11:23:52 +08:00
Wanwan 322411304c feat: CRM 客户限制 2023-11-12 14:34:49 +08:00
zyna 7598ed05cf crm联系人第二版新增字段 2023-11-11 23:31:09 +08:00
Wanwan 5b295d56b6 feat: CRM 客户限制 2023-11-11 20:49:52 +08:00
Wanwan 2915b46fa5 feat: CRM 客户公海配置 2023-11-09 00:01:43 +08:00
puhui999 f4c92089e5 CRM-客户：添加分页数据场景过滤 2023-11-08 16:42:22 +08:00
puhui999 388e07c834 CRM：完善模块数据放入公海、公海数据领取 2023-11-08 16:05:23 +08:00
puhui999 533b7295ab Merge remote-tracking branch 'yudao/feature/crm' into feature/crm 2023-11-08 14:46:33 +08:00
puhui999 c8ed99a5a4 CRM-客户：完善客户详情、分页、公海数据获取 2023-11-08 14:41:51 +08:00
xiaqing 18de22dc39 增加客户的公海领取和 2023-11-08 10:51:10 +08:00
xiaqing 645fe827a3 Merge remote-tracking branch 'origin/feature/crm' into feature/crm 2023-11-08 10:47:42 +08:00
xiaqing b06432b8f8 增加客户的公海领取和分配 2023-11-08 10:46:59 +08:00
Wanwan 71574da2cf feat: CRM 客户公海配置 2023-11-08 00:42:46 +08:00
Wanwan 4235beec3b Merge remote-tracking branch 'origin/feature/crm' into feature/crm 2023-11-07 22:54:54 +08:00
puhui999 668fae9398 CRM-数据权限：完善 code review 提到的问题 2023-11-07 17:52:18 +08:00
Wanwan a24919e555 style: 客户 review 修改 2023-11-06 21:59:23 +08:00
YunaiV 8efdf3141a code review：crm 商品逻辑 2023-11-05 20:47:56 +08:00
ZanGe丶 bf42f8e9ff 【增加CRM：产品以及产品分类】 2023-11-04 19:48:20 +08:00
YunaiV ecf728966f code review：客户逻辑 2023-11-04 10:13:43 +08:00
芋道源码 9ee6a27b86
!715 feat: 客户详情 + review 修改 
Merge pull request !715 from wanwan/feature/crm
 2023-11-04 01:39:34 +00:00
Wanwan 64db1a9c90 feat: 客户详情 + review 修改 2023-11-04 03:21:20 +08:00
YunaiV acdfc28ee6 code review：客户锁定的逻辑 2023-11-03 23:43:04 +08:00
芋道源码 9a007de947
!713 新增接口 
Merge pull request !713 from Joey/feature/crm
 2023-11-03 15:37:55 +00:00
YunaiV b7900c2035 code review：回款逻辑 2023-11-03 23:02:01 +08:00
Joey 0a58790c6b 新增客户锁定和解锁 接口 2023-11-03 22:07:47 +08:00
芋道源码 71ce831d59
!706 完善回款管理和回款计划功能 
Merge pull request !706 from souvc/feature/crm
 2023-11-03 11:16:48 +00:00
zhijiantianya@gmail.com 4092f298ed code review：crm 权限模块的实现 2023-11-03 18:53:40 +08:00
puhui999 68c9d563bc CRM-商机：新增获得商机公海分页接口 2023-11-01 16:39:23 +08:00
puhui999 23cfbfe491 CRM-数据权限：完善数据团队操作-添加、编辑、移除团队成员，退出团队 2023-11-01 16:24:36 +08:00
puhui999 7a8ffd9ccb CRM-商机：完善获取权限过滤后的分页数据 2023-11-01 11:28:05 +08:00