dhb52
|
a5d33692c1
|
refactor: TodayCustomer利用CrmCustomerController#getCustomerPage
|
2024-02-16 22:45:37 +08:00 |
|
puhui999
|
9caaa96e5b
|
CRM-合同: 新增更新合同商品如果有关联商机的话则更新商机商品
|
2024-02-08 11:53:23 +08:00 |
|
dhb52
|
3b612b2e6d
|
feat: 待回款提醒,即将到期的合同,待审核回款
|
2024-02-07 23:53:48 +08:00 |
|
dhb52
|
6fc8c4809f
|
feat: 合同[审批状态]条件筛选
|
2024-02-06 22:58:01 +08:00 |
|
puhui999
|
84f3b230d2
|
CRM-合同: 新增合同关联商品
|
2024-02-05 00:14:50 +08:00 |
|
安浩浩
|
3213cad317
|
新增：CRM 商业智能，其他排名接口
|
2024-02-04 23:54:58 +08:00 |
|
YunaiV
|
bf8ec22144
|
📖 CRM：code review 合同的代码实现
|
2024-02-04 12:57:26 +08:00 |
|
YunaiV
|
3347d3320d
|
📖 CRM：code review 合同的代码实现
|
2024-02-04 09:41:50 +08:00 |
|
puhui999
|
ba6218b835
|
CRM-合同: transfer
|
2024-02-03 22:13:02 +08:00 |
|
puhui999
|
59dfa10461
|
Merge remote-tracking branch 'yudao/develop' into develop
# Conflicts:
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/business/CrmBusinessServiceImpl.java
|
2024-02-03 20:52:08 +08:00 |
|
puhui999
|
53badfc367
|
CRM-CONTRACT: 完善合同编辑回显
|
2024-02-03 20:49:13 +08:00 |
|
puhui999
|
6a63f2f078
|
CRM-CONTRACT: 完善合同编辑回显
|
2024-02-03 14:08:06 +08:00 |
|
puhui999
|
59e6f23788
|
CRM-CONTRACT: 完善 TODO
|
2024-02-03 12:29:28 +08:00 |
|
YunaiV
|
e9a29e6dd4
|
CRM：优化合同金额排行、回款金额排行
|
2024-02-03 01:14:35 +08:00 |
|
芋道源码
|
1fd731a90a
|
!861 修改：CRM 商业智能，合并模块到 crm，优化查询
Merge pull request !861 from 安浩浩/develop
|
2024-02-02 01:29:35 +00:00 |
|
puhui999
|
1a96fb2ffc
|
Merge remote-tracking branch 'yudao/develop' into develop
# Conflicts:
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/contract/CrmContractServiceImpl.java
|
2024-02-01 14:17:15 +08:00 |
|
YunaiV
|
f5f827b59f
|
📖 CRM：code review 合同流程
|
2024-02-01 09:46:32 +08:00 |
|
puhui999
|
624b35988e
|
BPM: 实现业务流程结果监听器
|
2024-02-01 00:45:29 +08:00 |
|
安浩浩
|
46e01e07a8
|
修改：CRM 商业智能，合并模块到 crm，优化查询
|
2024-01-31 23:35:27 +08:00 |
|
芋道源码
|
acb8d3f23b
|
!858 CRM-客户: 完善客户导入
Merge pull request !858 from puhui999/develop
|
2024-01-30 04:41:14 +00:00 |
|
YunaiV
|
6f95f37117
|
📖 CRM：code review 待进入公海的客户
|
2024-01-30 12:40:23 +08:00 |
|
puhui999
|
4418a7bebc
|
CRM-合同：完善新增合同插入关联的商品
|
2024-01-28 20:15:11 +08:00 |
|
puhui999
|
ea6752f15e
|
BPM: 新增通过流程标识获取流程图
|
2024-01-28 16:34:39 +08:00 |
|
puhui999
|
1cab3c009c
|
CRM-合同：新增发起合同审批
|
2024-01-28 01:50:27 +08:00 |
|
dhb52
|
5d8ca19b17
|
feat: CRM-backlog-待进入公海的客户
|
2024-01-28 00:22:58 +08:00 |
|
YunaiV
|
ebd9222764
|
✨ ERP：初始化模块，立个 2024 年的 flag
|
2024-01-27 17:25:07 +08:00 |
|
puhui999
|
a877bb4731
|
CRM-客户: 完善客户导入
|
2024-01-27 15:15:30 +08:00 |
|
puhui999
|
4605e93105
|
CRM-客户: 完善客户导入
|
2024-01-27 14:30:30 +08:00 |
|
puhui999
|
d8b2da8eed
|
CRM-客户: 完善 TODO
|
2024-01-27 13:34:59 +08:00 |
|
YunaiV
|
d492daced4
|
📖 CRM：code review 跟进记录
|
2024-01-27 00:55:42 +08:00 |
|
芋道源码
|
6a6f669c7f
|
!854 CRM：【线索】
Merge pull request !854 from Minh-X/develop
|
2024-01-26 15:46:47 +00:00 |
|
YunaiV
|
814b6f688d
|
📖 CRM：code review 跟进记录
|
2024-01-26 23:46:02 +08:00 |
|
Minh-X
|
11ce24ad1e
|
修改CrmClueRespVO字段描述
Signed-off-by: Minh-X <bluesfish@yeah.net>
|
2024-01-25 14:17:24 +00:00 |
|
min
|
ce397d4fbd
|
CRM：【线索】增加字段
|
2024-01-24 00:27:09 +08:00 |
|
puhui999
|
ed92bf45ce
|
CRM: 客户自动掉入公海
|
2024-01-23 23:30:13 +08:00 |
|
puhui999
|
6850c7c71d
|
CRM: 完善跟进日志 TODO
|
2024-01-23 22:31:51 +08:00 |
|
YunaiV
|
a86bce6f8b
|
📖 CRM：code review 商机模块
|
2024-01-23 09:35:45 +08:00 |
|
YunaiV
|
655fc03394
|
Merge branch 'develop' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into develop
|
2024-01-23 09:24:00 +08:00 |
|
芋道源码
|
14d2195c6d
|
!850 商机模块代码优化
Merge pull request !850 from lzxhqs/develop
|
2024-01-23 01:23:52 +00:00 |
|
YunaiV
|
d732008ef8
|
📖 CRM：code review 跟进日志
|
2024-01-23 09:22:02 +08:00 |
|
puhui999
|
86a177226d
|
FIX: 修复启动报错
|
2024-01-22 23:23:00 +08:00 |
|
puhui999
|
ca9f3c522d
|
CRM-线索：完善操作日志
|
2024-01-22 22:46:52 +08:00 |
|
puhui999
|
8675d13548
|
CRM-线索：完善线索转客户
|
2024-01-22 22:23:23 +08:00 |
|
puhui999
|
f7d41186e4
|
CRM: 获取模块操作日志接口抽离
|
2024-01-22 20:30:12 +08:00 |
|
lzxhqs
|
fb54c5fc89
|
商机模块代码优化
|
2024-01-22 16:48:59 +08:00 |
|
YunaiV
|
206899bfc0
|
📖 CRM：code review 待办事项
|
2024-01-22 12:23:24 +08:00 |
|
芋道源码
|
422b19caf7
|
!847 fix: 根据Code Review修改代办消息backlog
Merge pull request !847 from dhb52/crm-msg
|
2024-01-22 04:14:18 +00:00 |
|
YunaiV
|
23ef3c8ae0
|
📖 CRM：code review 跟进记录
|
2024-01-22 08:53:59 +08:00 |
|
puhui999
|
227a4f126a
|
CRM: 完善跟进 TODO
|
2024-01-20 23:07:15 +08:00 |
|
puhui999
|
f366d440d8
|
Merge remote-tracking branch 'yudao/develop' into develop
|
2024-01-20 22:50:35 +08:00 |
|
puhui999
|
d293fdd474
|
fix: 修复 CRM 的一些 bug
|
2024-01-20 22:49:47 +08:00 |
|
dhb52
|
231fd68435
|
Merge remote-tracking branch 'upstream/develop' into crm-msg
|
2024-01-20 22:03:32 +08:00 |
|
YunaiV
|
c6c8dddfec
|
📖 CRM：code review 跟进记录
|
2024-01-20 19:05:16 +08:00 |
|
芋道源码
|
5b26d8fa00
|
!844 CRM: 完善跟进 TODO
Merge pull request !844 from puhui999/develop
|
2024-01-20 11:00:23 +00:00 |
|
YunaiV
|
39ae547b9d
|
📖 CRM：code review 线索逻辑
|
2024-01-20 18:55:28 +08:00 |
|
puhui999
|
8920b9787d
|
fix: CRM selectBatchIds 权限查询 ids 筛选不生效的 bug
|
2024-01-20 18:42:06 +08:00 |
|
min
|
604611e1d2
|
CRM：【线索】补充相关日志
|
2024-01-20 15:38:55 +08:00 |
|
min
|
4ce9271ece
|
CRM：【线索】创建、删除线索时同时创建、删除数据权限
|
2024-01-20 15:08:45 +08:00 |
|
puhui999
|
7914423c66
|
CRM: 完善跟进 TODO
|
2024-01-20 14:56:31 +08:00 |
|
min
|
ba4f9207e2
|
CRM：【线索】使用工具类替换stream操作
|
2024-01-20 13:55:05 +08:00 |
|
YunaiV
|
a9891405aa
|
✨ 统一 JDK8 和 JDK21 相关代码
|
2024-01-19 12:39:10 +08:00 |
|
YunaiV
|
aa716642ab
|
Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
# Conflicts:
# yudao-dependencies/pom.xml
# yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/task/BpmProcessInstanceController.java
# 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/business/CrmBusinessStatusTypeController.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/business/vo/business/CrmBusinessSaveReqVO.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/business/vo/business/CrmBusinessTransferReqVO.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/business/vo/business/CrmBusinessUpdateReqVO.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/clue/CrmClueController.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/clue/vo/CrmClueCreateReqVO.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/clue/vo/CrmClueRespVO.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/clue/vo/CrmClueSaveReqVO.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/clue/vo/CrmClueUpdateReqVO.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/contact/vo/CrmContactSaveReqVO.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/contact/vo/CrmContactUpdateReqVO.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/controller/admin/contactbusinesslink/vo/CrmContactBusinessLinkSaveReqVO.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/contract/CrmContractController.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/contract/vo/CrmContractSaveReqVO.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/contract/vo/CrmContractUpdateReqVO.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/controller/admin/customer/CrmCustomerLimitConfigController.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/customer/CrmCustomerPoolConfigController.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/customer/vo/CrmCustomerCreateReqVO.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/customer/vo/CrmCustomerSaveReqVO.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/customer/vo/CrmCustomerTransferReqVO.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/customer/vo/CrmCustomerUpdateReqVO.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/customer/vo/limitconfig/CrmCustomerLimitConfigSaveReqVO.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/customer/vo/limitconfig/CrmCustomerLimitConfigUpdateReqVO.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/customer/vo/poolconfig/CrmCustomerPoolConfigBaseVO.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/customer/vo/poolconfig/CrmCustomerPoolConfigSaveReqVO.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/permission/CrmPermissionController.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/product/CrmProductController.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/product/vo/product/CrmProductSaveReqVO.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/receivable/CrmReceivableController.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/receivable/CrmReceivablePlanController.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/framework/permission/core/aop/CrmPermissionAspect.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/business/CrmBusinessStatusService.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/business/CrmBusinessStatusTypeService.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/business/CrmBusinessStatusTypeServiceImpl.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/clue/CrmClueService.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/clue/CrmClueServiceImpl.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/contact/CrmContactService.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/contact/CrmContactServiceImpl.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/contactbusinesslink/CrmContactBusinessLinkService.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/contactbusinesslink/CrmContactBusinessLinkServiceImpl.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/contract/CrmContractService.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/contract/CrmContractServiceImpl.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/customer/CrmCustomerLimitConfigService.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/customer/CrmCustomerLimitConfigServiceImpl.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/customer/CrmCustomerPoolConfigServiceImpl.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
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/permission/CrmPermissionService.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/permission/CrmPermissionServiceImpl.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/product/CrmProductCategoryServiceImpl.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/product/CrmProductService.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/product/CrmProductServiceImpl.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/receivable/CrmReceivablePlanService.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/receivable/CrmReceivablePlanServiceImpl.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/receivable/CrmReceivableService.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/receivable/CrmReceivableServiceImpl.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/util/CrmQueryPageUtils.java
# yudao-module-crm/yudao-module-crm-biz/src/test/java/cn/iocoder/yudao/module/crm/service/business/CrmBusinessServiceImplTest.java
# yudao-module-crm/yudao-module-crm-biz/src/test/java/cn/iocoder/yudao/module/crm/service/clue/CrmClueServiceImplTest.java
# yudao-module-crm/yudao-module-crm-biz/src/test/java/cn/iocoder/yudao/module/crm/service/contract/ContractServiceImplTest.java
# yudao-module-crm/yudao-module-crm-biz/src/test/java/cn/iocoder/yudao/module/crm/service/customer/CrmCustomerServiceImplTest.java
# yudao-module-crm/yudao-module-crm-biz/src/test/java/cn/iocoder/yudao/module/crm/service/customerlimitconfig/CrmCustomerLimitConfigServiceImplTest.java
# yudao-module-crm/yudao-module-crm-biz/src/test/java/cn/iocoder/yudao/module/crm/service/receivable/CrmCrmReceivablePlanServiceImplTest.java
# yudao-module-crm/yudao-module-crm-biz/src/test/java/cn/iocoder/yudao/module/crm/service/receivable/CrmCrmReceivableServiceImplTest.java
# yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/api/sku/ProductSkuApiImpl.java
# yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/api/spu/ProductSpuApiImpl.java
# yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/category/ProductCategoryController.java
# yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/category/vo/ProductCategoryCreateReqVO.java
# yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/category/vo/ProductCategorySaveReqVO.java
# yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/category/vo/ProductCategoryUpdateReqVO.java
# yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/comment/ProductCommentController.java
# yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/comment/vo/ProductCommentBaseVO.java
# yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/comment/vo/ProductCommentRespVO.java
# yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/property/ProductPropertyController.java
# yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/property/ProductPropertyValueController.java
# yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/property/vo/property/ProductPropertySaveReqVO.java
# yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/property/vo/property/ProductPropertyUpdateReqVO.java
# yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/property/vo/value/ProductPropertyValueSaveReqVO.java
# yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/property/vo/value/ProductPropertyValueUpdateReqVO.java
# yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/sku/vo/ProductSkuRespVO.java
# yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/spu/ProductSpuController.java
# yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/spu/vo/ProductSkuSaveReqVO.java
# yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/spu/vo/ProductSpuCreateReqVO.java
# yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/spu/vo/ProductSpuSaveReqVO.java
# yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/spu/vo/ProductSpuUpdateReqVO.java
# yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/app/category/AppCategoryController.java
# yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/app/comment/AppProductCommentController.java
# yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/app/spu/AppProductSpuController.java
# yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/app/spu/vo/AppProductSpuPageReqVO.java
# yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/category/ProductCategoryService.java
# yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/category/ProductCategoryServiceImpl.java
# yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/comment/ProductCommentServiceImpl.java
# yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/property/ProductPropertyServiceImpl.java
# yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/property/ProductPropertyValueServiceImpl.java
# yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/sku/ProductSkuServiceImpl.java
# yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/spu/ProductSpuService.java
# yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/spu/ProductSpuServiceImpl.java
# yudao-module-mall/yudao-module-product-biz/src/test/java/cn/iocoder/yudao/module/product/service/category/ProductCategoryServiceImplTest.java
# yudao-module-mall/yudao-module-product-biz/src/test/java/cn/iocoder/yudao/module/product/service/spu/ProductSpuServiceImplTest.java
# yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/api/combination/CombinationRecordApiImpl.java
# yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/admin/decorate/DecorateComponentController.java
# yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/admin/decorate/vo/DecorateComponentSaveReqVO.java
# yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/app/activity/AppActivityController.java
# yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/app/combination/AppCombinationRecordController.java
# yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/app/decorate/AppDecorateController.java
# yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/app/diy/AppDiyTemplateController.java
# yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/service/combination/CombinationRecordServiceImpl.java
# yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/service/decorate/DecorateComponentServiceImpl.java
# yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/service/discount/DiscountActivityService.java
# yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/service/discount/DiscountActivityServiceImpl.java
# yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/service/diy/DiyTemplateServiceImpl.java
# yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/service/reward/RewardActivityService.java
# yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/service/reward/RewardActivityServiceImpl.java
# yudao-module-mall/yudao-module-statistics-biz/src/main/java/cn/iocoder/yudao/module/statistics/controller/admin/trade/TradeStatisticsController.java
# yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/order/AppTradeOrderController.java
# yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/signin/MemberSignInRecordServiceImpl.java
# yudao-module-mp/yudao-module-mp-biz/src/main/java/cn/iocoder/yudao/module/mp/controller/admin/statistics/vo/MpStatisticsGetReqVO.java
# yudao-module-mp/yudao-module-mp-biz/src/main/java/cn/iocoder/yudao/module/mp/service/message/MpMessageServiceImpl.java
# yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/controller/app/wallet/AppPayWalletTransactionController.java
# yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/logger/OperateLogApi.java
# yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/social/dto/SocialUserUnbindReqDTO.java
# yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/api/logger/OperateLogApiImpl.java
# yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/api/user/AdminUserApiImpl.java
# yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/logger/OperateLogServiceImpl.java
# yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/social/SocialClientServiceImpl.java
# yudao-module-system/yudao-module-system-biz/src/test/java/cn/iocoder/yudao/module/system/service/auth/AdminAuthServiceImplTest.java
# yudao-server/src/main/resources/application-local.yaml
|
2024-01-19 09:13:18 +08:00 |
|
YunaiV
|
6624a93a84
|
CRM：跟进记录 code review
|
2024-01-18 12:17:12 +08:00 |
|
YunaiV
|
ca55282516
|
CRM：商机 code review
|
2024-01-18 12:06:14 +08:00 |
|
puhui999
|
7b36eb888e
|
CRM-合同：RespVO 添加导出注解
|
2024-01-17 12:11:39 +08:00 |
|
puhui999
|
ff9cef6a92
|
CRM: 完善跟进，新增跟进信息处理器 handler 接口✔
|
2024-01-17 12:00:51 +08:00 |
|
dhb52
|
5105c6d16f
|
wip: LocalDate.now().atTime
|
2024-01-16 11:06:01 +08:00 |
|
dhb52
|
08e23a7dc4
|
wip: style-fix
|
2024-01-15 22:47:46 +08:00 |
|
YunaiV
|
9819e05d4e
|
Merge branch 'develop' of https://gitee.com/aberizofur/ruoyi-vue-pro into develop
|
2024-01-15 21:34:47 +08:00 |
|
YunaiV
|
a886ad9785
|
📖 CRM：跟进记录的 code review
|
2024-01-15 21:30:32 +08:00 |
|
lzxhqs
|
510b4fd3de
|
商机模块合并代码
|
2024-01-15 17:50:46 +08:00 |
|
dhb52
|
4bd97c4baf
|
wip: 根据code review优化代码
|
2024-01-15 17:41:21 +08:00 |
|
YunaiV
|
410c551e03
|
📖 CRM：跟进记录的 code review
|
2024-01-15 13:43:15 +08:00 |
|
芋道源码
|
e64e60c711
|
!832 CRM: 完善一些 TODO
Merge pull request !832 from puhui999/develop
|
2024-01-15 04:37:24 +00:00 |
|
芋道源码
|
cc6cb83507
|
!833 修改：CRM 产品，产品列表查询接入数据权限
Merge pull request !833 from 安浩浩/develop
|
2024-01-15 04:33:16 +00:00 |
|
YunaiV
|
9b7f6cfbac
|
📖 CRM：线索的 code review
|
2024-01-15 12:29:57 +08:00 |
|
芋道源码
|
4ca1f72d4f
|
!829 CRM：【线索】
Merge pull request !829 from Minh-X/develop
|
2024-01-15 04:22:23 +00:00 |
|
YunaiV
|
64e1d68923
|
📖 CRM：待办事项的 code review
|
2024-01-15 12:15:52 +08:00 |
|
anhaohao
|
454e800067
|
修改：CRM 产品，产品列表查询接入数据权限
|
2024-01-15 10:51:23 +08:00 |
|
puhui999
|
5efa0f327f
|
crm: 完善一些 TODO
|
2024-01-14 22:49:01 +08:00 |
|
dhb52
|
4558ecd836
|
wip: 待办事项
|
2024-01-14 22:45:16 +08:00 |
|
lzxhqs
|
f361d05940
|
商机模块
|
2024-01-14 09:52:35 +08:00 |
|
puhui999
|
73c459f360
|
完善更进
|
2024-01-14 00:22:17 +08:00 |
|
min
|
2de0fb48ea
|
CRM：【线索】 线索如果不存在或者已经转化，抛出异常
|
2024-01-13 23:27:21 +08:00 |
|
min
|
fe0bde8417
|
CRM：【线索】 CrmClueExcelVO 融合到 CrmClueRespVO 里
|
2024-01-13 23:27:21 +08:00 |
|
puhui999
|
eaa8e4be96
|
操作日志字段解析方法调整
|
2024-01-13 22:29:05 +08:00 |
|
YunaiV
|
df29f0682f
|
📖 CRM：线索模块的 review
|
2024-01-13 11:07:28 +08:00 |
|
YunaiV
|
8d2008f2b5
|
Merge branch 'develop' of https://gitee.com/Minh-X/ruoyi-vue-pro into develop
# Conflicts:
# 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/clue/CrmClueServiceImpl.java
|
2024-01-13 11:04:20 +08:00 |
|
YunaiV
|
6891b75e27
|
📖 CRM：产品模块的 review
|
2024-01-13 10:25:04 +08:00 |
|
芋道源码
|
19c0227cef
|
!826 CRM 产品分类和产品，优化了操作日志 ,新增获得产品操作日志
Merge pull request !826 from 安浩浩/develop
|
2024-01-13 02:04:37 +00:00 |
|
YunaiV
|
e79c750b46
|
📖 CRM：code review 跟进记录的实现
|
2024-01-13 09:56:53 +08:00 |
|
anhaohao
|
008f88d185
|
新增：CRM 产品，新增获得产品操作日志
|
2024-01-11 17:45:09 +08:00 |
|
anhaohao
|
803816b162
|
修改：CRM 产品分类和产品，优化了操作日志
|
2024-01-11 16:02:05 +08:00 |
|
puhui999
|
6b426fcd01
|
CRM: 修复一下差异
|
2024-01-10 22:06:02 +08:00 |
|
puhui999
|
ad4044f932
|
Merge remote-tracking branch 'yudao/develop' into develop
# Conflicts:
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/convert/customer/CrmCustomerConvert.java
|
2024-01-10 21:13:33 +08:00 |
|
puhui999
|
19fa65b0c3
|
CRM: 新增跟进记录
|
2024-01-10 21:09:08 +08:00 |
|
puhui999
|
ba103d6e86
|
CRM: 完善一些 TODO 提到的问题
|
2024-01-10 16:25:55 +08:00 |
|
puhui999
|
1a5fe6fa9a
|
CRM: 完善客户、联系人、合同、回款计划、回款的操作日志
|
2024-01-10 15:28:53 +08:00 |
|
puhui999
|
9bba1ce8a4
|
新增 ParseFunctionNameConstants 常量枚举
|
2024-01-10 11:29:29 +08:00 |
|
min
|
0ee7fedea8
|
CRM：【线索】使用BeanUtils替换mapstruct
|
2024-01-10 00:38:23 +08:00 |
|
min
|
99b8465e29
|
CRM：【线索】SaveReqVO去除客户编号字段
|
2024-01-10 00:16:37 +08:00 |
|
min
|
1280f49a04
|
CRM：【线索】转化为客户接口修改
|
2024-01-10 00:10:47 +08:00 |
|
YunaiV
|
722b33513c
|
📖 CRM：code review 线索模块
|
2024-01-09 21:58:50 +08:00 |
|
YunaiV
|
6a93484260
|
📖 CRM：code review 线索模块
|
2024-01-09 13:52:04 +08:00 |
|
min
|
81f838c5d2
|
CRM：【线索】创建、更新线索时添加校验，改用相同vo
|
2024-01-09 01:30:42 +08:00 |
|
min
|
4d68e5e747
|
CRM：【线索】创建线索时客户改为非必填
|
2024-01-09 01:27:53 +08:00 |
|
min
|
4237cfb4a9
|
CRM：【线索】线索转化为客户
|
2024-01-09 01:27:53 +08:00 |
|
YunaiV
|
772b794374
|
📖 CRM：code review CRM 产品分类
|
2024-01-08 19:08:03 +08:00 |
|
anhaohao
|
4afff6185e
|
新增：CRM 产品分类和产品，接入操作日志，数据权限控制
|
2024-01-08 15:15:42 +08:00 |
|
YunaiV
|
2d1e57554d
|
📖 CRM：code review CRM 客户逻辑
|
2024-01-07 22:07:17 +08:00 |
|
芋道源码
|
3c7f63c356
|
!810 fix：修复 issues 提到的一些公众号上的问题
Merge pull request !810 from puhui999/develop
|
2024-01-07 13:23:53 +00:00 |
|
YunaiV
|
19d5a0c2aa
|
📖 CRM：code review crm 联系人新增操作日志
|
2024-01-07 18:19:08 +08:00 |
|
zyna
|
44d828023c
|
crm联系人新增操作日志
|
2024-01-06 21:06:38 +08:00 |
|
puhui999
|
68f5edaa88
|
CRM-客户: 完善一些 TODO
|
2024-01-06 15:28:10 +08:00 |
|
puhui999
|
3170e7fd97
|
CRM-客户: 简化客户公海配置 VO，完善相关操作日志
|
2024-01-06 13:48:22 +08:00 |
|
puhui999
|
9ce50ec369
|
CRM-客户限制配置：VO 简化
|
2024-01-06 13:04:30 +08:00 |
|
puhui999
|
269816446a
|
CRM-客户：日志表达式调整
|
2024-01-06 12:27:30 +08:00 |
|
puhui999
|
a1c17b9b00
|
CRM-客户：日志表达式调整
|
2024-01-05 17:40:21 +08:00 |
|
puhui999
|
d8bb55fc0b
|
CRM-客户：完善操作日志
|
2024-01-05 14:43:48 +08:00 |
|
puhui999
|
ea4b4b8956
|
CRM-客户：精简 VO
|
2024-01-05 00:15:26 +08:00 |
|
YunaiV
|
a974d055b6
|
📖 CRM：【还款】code review 还款的代码，补全对应的 todo list
|
2024-01-04 09:41:58 +08:00 |
|
YunaiV
|
c6a9751511
|
📖 CRM：【合同】code review 合同的代码，补全对应的 todo list
|
2024-01-04 09:18:44 +08:00 |
|
YunaiV
|
2668e0cfeb
|
📖 CRM：【产品】code review 产品的代码，补全对应的 todo list
|
2024-01-04 08:01:04 +08:00 |
|
YunaiV
|
b9f1e8ffaf
|
📖 CRM：【联系人】code review 商机的代码，补全对应的 todo list
|
2024-01-04 07:53:00 +08:00 |
|
YunaiV
|
02324f9e60
|
✨ CRM：【联系人】统一字段
|
2024-01-03 23:30:25 +08:00 |
|
YunaiV
|
cff6e520ee
|
📖 CRM：【联系人】code review 联系人的代码，补全对应的 todo list
|
2024-01-03 22:07:20 +08:00 |
|
YunaiV
|
f8f5e525be
|
✨ CRM：新增跟进记录表
|
2024-01-03 20:56:28 +08:00 |
|
YunaiV
|
2e7c3e09a9
|
📖 CRM：code review 所有代码，补充对应 todo
|
2024-01-03 19:38:13 +08:00 |
|
YunaiV
|
d0df0e8e16
|
📖 CRM：【客户】优化锁定客户的逻辑实现
|
2024-01-03 13:06:49 +08:00 |
|
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
|
2024-01-02 22:21:14 +08:00 |
|
YunaiV
|
1da8006af3
|
📖 CRM：【客户】完善列表、新增、修改接口的 todo
|
2024-01-02 21:45:02 +08:00 |
|
YunaiV
|
9e3055ee1e
|
📖 CRM：code review 商机模块
|
2024-01-02 18:49:14 +08:00 |
|
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
|
2023-12-30 21:43:04 +08:00 |
|
YunaiV
|
8c9b483ac5
|
📖 code review 操作日志的实现
|
2023-12-30 21:36:46 +08:00 |
|
puhui999
|
e5377074d5
|
数据权限：完善 code review 提到的问题
|
2023-12-26 00:21:04 +08:00 |
|
puhui999
|
6950368991
|
操作日志：完善 code review 提到的问题
|
2023-12-26 00:04:20 +08:00 |
|
YunaiV
|
5de6a8bd23
|
📖 code review：操作日志的实现
|
2023-12-25 21:40:16 +08:00 |
|
puhui999
|
e8ade5f1fe
|
crm：完善一些遗留的 TODO
|
2023-12-23 20:10:40 +08:00 |
|
puhui999
|
f56d8a2751
|
重构操作日志记录实现
|
2023-12-19 18:34:51 +08:00 |
|
puhui999
|
1fae341cae
|
重构操作日志记录实现
|
2023-12-19 16:29:13 +08:00 |
|
puhui999
|
55a215da44
|
CRM-数据权限：完善数据权限补全管理员和公海相关情况处理逻辑
|
2023-12-19 10:43:45 +08:00 |
|
puhui999
|
3e91ac73c4
|
CRM：完善数据分页查询条件构造 CrmQueryWrapperUtils
|
2023-12-19 10:29:41 +08:00 |
|
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
|
2023-12-17 17:47:46 +08:00 |
|
zyna
|
8434a8cd68
|
crm联系人商机功能修改
|
2023-12-17 17:33:52 +08:00 |
|
YunaiV
|
ddb6fe7ec8
|
📖 CRM：code review 客户管理的数据权限、操作权限
|
2023-12-17 10:57:49 +08:00 |
|
puhui999
|
daf4651a4f
|
系统操作日志：集成 mzt-biz-log 5，增加日志保存和查询接口
|
2023-12-14 18:45:13 +08:00 |
|
puhui999
|
3c74b22933
|
系统操作日志：集成 mzt-biz-log 4
|
2023-12-13 17:45:43 +08:00 |
|
puhui999
|
c74881c8f0
|
系统操作日志：集成 mzt-biz-log 3
|
2023-12-13 15:18:19 +08:00 |
|
puhui999
|
13d6c42a48
|
系统操作日志：集成 mzt-biz-log 2
|
2023-12-12 22:42:50 +08:00 |
|
puhui999
|
c5cc818a49
|
系统操作日志：集成 mzt-biz-log
|
2023-12-12 22:29:40 +08:00 |
|