Commit Graph

42 Commits

Author SHA1 Message Date
YunaiV
73e76ab453 Merge remote-tracking branch 'origin/master' into feature/crm
# Conflicts:
#	yudao-module-crm/yudao-module-crm-biz/src/test/java/cn/iocoder/yudao/module/crm/service/contract/ContractServiceImplTest.java
#	yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dict/DictDataController.java
2023-12-05 22:42:53 +08:00
YunaiV
a11d5dc5f1 🔨 CRM:优化产品代码的实现 2023-12-05 22:41:58 +08:00
YunaiV
72969e921e crm: 增加基于客户查询回款计划分页 2023-12-01 22:46:13 +08:00
YunaiV
f02b9464bd crm: 增加基于客户查询回款分页 2023-12-01 19:37:44 +08:00
YunaiV
eeeafcc10c 1.9.0 版本发布 2023-11-30 21:14:13 +08:00
YunaiV
2d9f5cc4d0 crm: 1)调整合同的 CRM 前缀;2)增加基于客户查询合同分页 2023-11-30 19:12:37 +08:00
YunaiV
492adfe8e5 crm:code review 数据权限 2023-11-27 20:51:51 +08:00
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
2023-11-27 12:12:52 +08:00
puhui999
8f06d02293 crm-客户:完善 code review 提到的问题 2023-11-27 12:00:53 +08:00
YunaiV
f766474ff4 crm:code review 客户配置 2023-11-26 19:57:40 +08:00
Wanwan
ab3748d102 feat: 客户配置 review 修改 2023-11-25 23:54:08 +08:00
YunaiV
63f9bcb0a3 crm:code review 商机类型、状态 2023-11-25 12:02:03 +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
ljlleo
4e1d9d6292 商机、商机状态类型和商机状态 2023-11-24 14:24:04 +08:00
puhui999
77d7bcc73f crm-数据权限:完善数据权限 code review 提到的问题 2023-11-22 17:56:13 +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
Wanwan
5b295d56b6 feat: CRM 客户限制 2023-11-11 20:49:52 +08:00
puhui999
c8ed99a5a4 CRM-客户:完善客户详情、分页、公海数据获取 2023-11-08 14:41:51 +08:00
liuhongfeng
95e9dc81c9 【修改】回款计划和回款管理统一带上Crm前缀,防止和其他模块冲突。 2023-10-31 01:09:40 +08:00
liuhongfeng
f1f180ff77 【新增】字典归类
【修改】规范实体命名和字段类型修改
2023-10-31 00:35:41 +08:00
liuhongfeng
798dd3269f Merge branch 'feature/crm' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/crm 2023-10-30 21:35:14 +08:00
liuhongfeng
921c2ab757 【新增】负责人
【修改】规范命名:期数:indexNo-》period
2023-10-30 21:33:28 +08:00
puhui999
c2fd817989 完善 CRM-客户 数据权限校验 2023-10-30 16:52:01 +08:00
puhui999
e6eaa3a24a 完善 CRM-数据权限校验方式 2023-10-30 16:29:24 +08:00
puhui999
bec8a27a21 新增 CRM-数据权限 注解实现 2023-10-30 00:49:36 +08:00
Wanwan
c18f5baa4b feat: 调整客户表的字段 2023-10-28 22:47:56 +08:00
YunaiV
bf247a6626 Merge branch 'feature/crm' of https://gitee.com/ljlleo/ruoyi-vue-pro into feature/crm
# Conflicts:
#	sql/mysql/crm.sql
2023-10-27 23:11:16 +08:00
YunaiV
74f786f8ed code review:客户表的实现 2023-10-27 22:56:46 +08:00
ljlleo
75115bcc48 1、商机前端页面;
2、商机状态类型和商机状态字段的处理;
2023-10-26 16:22:44 +08:00
Wanwan
04613af0cd feat: 客户表的 crud 2023-10-25 00:25:00 +08:00
YunaiV
b5560fa0be code review:CRM 线索表的逻辑 2023-10-21 22:05:37 +08:00
YunaiV
f942e2c7f2 code review:CRM 回款计划的逻辑 2023-10-21 21:55:21 +08:00
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
2023-10-21 21:41:16 +08:00
liuhongfeng
34a5785768 【新增】回款计划 功能 2023-10-20 23:48:19 +08:00
liuhongfeng
73f4fc8ceb 【新增】回款管理 功能 2023-10-20 22:16:34 +08:00
ljlleo
bee6f41211 商机 2023-10-20 16:01:54 +08:00
YunaiV
439edcd1be code review:crm 线索的 crud 2023-10-19 23:15:18 +08:00
wanwan
48661f980c !679 feat: CRM 线索表 crud
* feat: CRM 线索表 crud
* feat: CRM 线索表 crud
2023-10-19 14:52:16 +00:00
dhb52
164be5732b feat: CRM/合同管理 - SQL 2023-10-16 23:53:27 +08:00
dhb52
eedb528412 feat: CRM/合同管理 - crud 2023-10-16 23:53:17 +08:00
dhb52
e26bd20a5b feat:添加测试配置及excel依赖 2023-10-16 23:45:18 +08:00