puhui999
|
0a97ff03c6
|
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-23 12:16:37 +08:00 |
|
puhui999
|
c6b133d919
|
CRM: 完善回款
|
2024-02-23 12:14:56 +08:00 |
|
puhui999
|
b3cfad9396
|
CRM: 完善回款计划
|
2024-02-23 10:42:36 +08:00 |
|
YunaiV
|
d604e76d16
|
✨ CRM：完善合同的跟进记录实现
|
2024-02-23 09:31:41 +08:00 |
|
YunaiV
|
b0def8b586
|
✨ CRM：完善合同的新增、修改实现
|
2024-02-23 00:04:57 +08:00 |
|
YunaiV
|
ef26b5e8dc
|
✨ CRM：完善合同的列表实现
|
2024-02-22 21:54:06 +08:00 |
|
puhui999
|
872fe53585
|
Merge remote-tracking branch 'yudao/develop' into develop
|
2024-02-22 21:26:28 +08:00 |
|
YunaiV
|
c97c9f882e
|
✨ CRM：完成商机状态的变更
|
2024-02-22 20:41:28 +08:00 |
|
JUNHAO
|
a345328a0c
|
修复：错误的queryWrapper构建
|
2024-02-22 18:12:59 +08:00 |
|
moon69
|
a8ee4a85ce
|
修正注释错误
|
2024-02-22 12:53:59 +08:00 |
|
puhui999
|
0f2d974e9c
|
Merge remote-tracking branch 'yudao/develop' into develop
|
2024-02-22 11:08:11 +08:00 |
|
puhui999
|
41b8575b8d
|
CRM：完善客户导入
|
2024-02-22 11:07:34 +08:00 |
|
YunaiV
|
740e9297fa
|
✨ CRM：完善商机和联系人之间的关联
|
2024-02-22 09:35:57 +08:00 |
|
puhui999
|
b26eb6266f
|
CRM：新增客户导入模版所属行业、客户等级、客户来源、客户地区单元格下拉选择
|
2024-02-22 00:58:50 +08:00 |
|
YunaiV
|
d9b0c9b4cf
|
✨ CRM：完善商机的跟进记录
|
2024-02-21 23:37:10 +08:00 |
|
芋道源码
|
df2441def9
|
!875 完善 review 提到的问题
Merge pull request !875 from puhui999/develop
|
2024-02-21 14:57:22 +00:00 |
|
puhui999
|
1ad5602a19
|
Merge remote-tracking branch 'yudao/develop' into develop
# Conflicts:
# 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/service/business/CrmBusinessServiceImpl.java
|
2024-02-21 22:42:41 +08:00 |
|
YunaiV
|
77f98c4d12
|
✨ CRM：完善商机的新增、修改逻辑
|
2024-02-21 21:49:49 +08:00 |
|
YunaiV
|
f76a7cd941
|
✨ CRM：重构商机状态的代码实现，不调整表结构
|
2024-02-21 20:10:13 +08:00 |
|
YunaiV
|
e01dda9baf
|
✨ CRM：完善商机的列表
|
2024-02-21 18:45:10 +08:00 |
|
colorfulgray0
|
9878ebbf3b
|
fix: 错误码bug
|
2024-02-21 15:24:02 +08:00 |
|
puhui999
|
02b63de808
|
CRM：完善 review 提到的问题
|
2024-02-21 14:27:25 +08:00 |
|
YunaiV
|
7dd35f3295
|
✨ CRM：完善联系人的编辑、详情
|
2024-02-20 23:32:26 +08:00 |
|
YunaiV
|
66a34a6d90
|
✨ CRM：完善联系人的列表
|
2024-02-20 21:18:45 +08:00 |
|
YunaiV
|
4b41c3c692
|
✨ CRM：优化客户的 backlog 逻辑
|
2024-02-20 20:19:59 +08:00 |
|
YunaiV
|
b444312ea8
|
✨ CRM：优化客户的过期到公海的逻辑
|
2024-02-20 19:07:48 +08:00 |
|
YunaiV
|
3e6524932b
|
✨ CRM：优化客户的详情、更新成交状态
|
2024-02-20 12:55:44 +08:00 |
|
YunaiV
|
69a974ef02
|
📖 CRM：线索的跟进逻辑
|
2024-02-19 22:47:28 +08:00 |
|
芋道源码
|
bac476c131
|
!871 fix: 根据code-review修改Crm Backlog
Merge pull request !871 from dhb52/develop
|
2024-02-19 14:10:17 +00:00 |
|
YunaiV
|
38e410cae0
|
📖 CRM：线索的转化逻辑
|
2024-02-19 20:41:10 +08:00 |
|
YunaiV
|
fe330482b3
|
📖 CRM：线索 clue 新增/修改的完善
|
2024-02-19 19:02:12 +08:00 |
|
YunaiV
|
49bc70ed82
|
📖 CRM：线索 clue 列表的完善
|
2024-02-19 13:02:41 +08:00 |
|
dhb52
|
dca262c64b
|
fix: 根据code-review修改
|
2024-02-18 22:58:23 +08:00 |
|
YunaiV
|
1bfb406041
|
📖 CRM：code review 待提醒逻辑
|
2024-02-18 21:47:36 +08:00 |
|
芋道源码
|
51f52ff4b7
|
!870 feat: CRM/backlog 提醒数量
Merge pull request !870 from dhb52/develop
|
2024-02-18 13:27:44 +00:00 |
|
YunaiV
|
4bf4432f93
|
✨ CRM：单测暂时不写
|
2024-02-18 21:11:43 +08:00 |
|
YunaiV
|
9ea7bde751
|
📖 ERP：增加 ERP 首页的统计
|
2024-02-18 19:05:40 +08:00 |
|
dhb52
|
1ba2b7b600
|
fix: Customer,Clue增加followUpStatus自动查询
|
2024-02-18 00:21:10 +08:00 |
|
dhb52
|
cd1e73cc3f
|
Merge remote-tracking branch 'upstream/develop' into develop
# Conflicts:
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/contract/CrmContractService.java
|
2024-02-18 00:05:24 +08:00 |
|
dhb52
|
d23dfd4276
|
feat: CRM/backlog 提醒数量
|
2024-02-18 00:03:11 +08:00 |
|
YunaiV
|
123a009394
|
Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
|
2024-02-17 23:51:11 +08:00 |
|
YunaiV
|
21452af780
|
✨ 2.0.1 版本发布准备
|
2024-02-17 23:44:23 +08:00 |
|
YunaiV
|
3b2200ad80
|
✨ 2.0.1 版本发布准备
|
2024-02-17 23:26:50 +08:00 |
|
YunaiV
|
08c259424a
|
Merge remote-tracking branch 'origin/master'
|
2024-02-17 21:41:08 +08:00 |
|
YunaiV
|
fb66b2768e
|
✨ 2.0.1 版本发布准备
|
2024-02-17 21:41:02 +08:00 |
|
YunaiV
|
169c1e4907
|
✨ 2.0.1 版本发布准备
|
2024-02-17 21:40:50 +08:00 |
|
YunaiV
|
ce2975a0f1
|
Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
# Conflicts:
# pom.xml
# yudao-dependencies/pom.xml
# yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/definition/BpmModelController.java
# yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/task/vo/instance/BpmProcessInstanceCCReqVO.java
# yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/candidate/BpmCandidateSourceInfo.java
# yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/cc/BpmProcessInstanceCopyServiceImpl.java
# yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/definition/BpmModelService.java
# yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/definition/BpmModelServiceImpl.java
# yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/definition/BpmProcessDefinitionServiceImpl.java
# yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/task/BpmTaskService.java
# yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/task/BpmTaskServiceImpl.java
# yudao-module-bpm/yudao-module-bpm-biz/src/test/java/cn/iocoder/yudao/module/bpm/service/cc/BpmProcessInstanceCopyServiceTest.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/product/CrmBusinessProductSaveReqVO.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/contract/vo/CrmContractSaveReqVO.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/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/bo/CrmBusinessUpdateFollowUpReqBO.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/contact/bo/CrmContactUpdateFollowUpReqBO.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/bo/CrmContractUpdateFollowUpReqBO.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/followup/CrmFollowUpRecordService.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/followup/CrmFollowUpRecordServiceImpl.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/followup/handle/CrmBusinessFollowUpHandler.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/followup/handle/CrmClueFollowUpHandler.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/followup/handle/CrmContactFollowUpHandler.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/followup/handle/CrmContractFollowUpHandler.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/followup/handle/CrmCustomerFollowUpHandler.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/message/CrmBacklogServiceImpl.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/permission/bo/CrmPermissionUpdateReqBO.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/CrmReceivableServiceImpl.java
# yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/file/FileController.java
# yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/service/file/FileServiceImpl.java
# yudao-module-mall/yudao-module-product-biz/src/test/java/cn/iocoder/yudao/module/product/service/comment/ProductCommentServiceImplTest.java
# yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/notice/vo/NoticeSaveReqVO.java
|
2024-02-17 21:04:03 +08:00 |
|
YunaiV
|
20f8cb1606
|
✨ 2.0.1 版本发布准备
|
2024-02-17 21:01:59 +08:00 |
|
YunaiV
|
63f322cb17
|
📖 CRM：code review 前端直接上传
|
2024-02-17 20:35:48 +08:00 |
|
芋道源码
|
b2782e1d9a
|
!865 基础设施：前端直连上传文件
Merge pull request !865 from 疯狂的世界/develop
|
2024-02-17 11:21:06 +00:00 |
|