YunaiV
|
123a009394
|
Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
|
2 years ago |
|
YunaiV
|
21452af780
|
✨ 2.0.1 版本发布准备
|
2 years ago |
|
YunaiV
|
fb66b2768e
|
✨ 2.0.1 版本发布准备
|
2 years ago |
|
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
|
2 years ago |
|
YunaiV
|
0fba56cda8
|
📖 CRM：code review 合同逻辑
|
2 years ago |
|
YunaiV
|
c6041da3c4
|
Merge branch 'develop' of https://gitee.com/puhui999/ruoyi-vue-pro into develop
# Conflicts:
# yudao-module-erp/yudao-module-erp-biz/src/test/java/cn/iocoder/yudao/module/erp/service/product/ErpProductUnitServiceImplTest.java
|
2 years ago |
|
YunaiV
|
c40ea1eaa6
|
📖 CRM：code review 商业智能的排行版
|
2 years ago |
|
芋道源码
|
bba32c6ba3
|
!866 新增：CRM 商业智能，其他排名接口
Merge pull request !866 from 安浩浩/develop
|
2 years ago |
|
YunaiV
|
5955f39e24
|
📖 CRM：code review 待办项目的实现
|
2 years ago |
puhui999
|
9caaa96e5b
|
CRM-合同: 新增更新合同商品如果有关联商机的话则更新商机商品
|
2 years ago |
dhb52
|
3b612b2e6d
|
feat: 待回款提醒,即将到期的合同,待审核回款
|
2 years ago |
|
dhb52
|
6fc8c4809f
|
feat: 合同[审批状态]条件筛选
|
2 years ago |
|
puhui999
|
84f3b230d2
|
CRM-合同: 新增合同关联商品
|
2 years ago |
安浩浩
|
3213cad317
|
新增：CRM 商业智能，其他排名接口
|
2 years ago |
|
YunaiV
|
bf8ec22144
|
📖 CRM：code review 合同的代码实现
|
2 years ago |
|
YunaiV
|
3347d3320d
|
📖 CRM：code review 合同的代码实现
|
2 years ago |
|
puhui999
|
ba6218b835
|
CRM-合同: transfer
|
2 years ago |
|
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
|
2 years ago |
|
puhui999
|
53badfc367
|
CRM-CONTRACT: 完善合同编辑回显
|
2 years ago |
|
puhui999
|
6a63f2f078
|
CRM-CONTRACT: 完善合同编辑回显
|
2 years ago |
|
puhui999
|
59e6f23788
|
CRM-CONTRACT: 完善 TODO
|
2 years ago |
|
YunaiV
|
e9a29e6dd4
|
CRM：优化合同金额排行、回款金额排行
|
2 years ago |
|
芋道源码
|
1fd731a90a
|
!861 修改：CRM 商业智能，合并模块到 crm，优化查询
Merge pull request !861 from 安浩浩/develop
|
2 years ago |
|
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
|
2 years ago |
|
YunaiV
|
f5f827b59f
|
📖 CRM：code review 合同流程
|
2 years ago |
|
puhui999
|
624b35988e
|
BPM: 实现业务流程结果监听器
|
2 years ago |
|
安浩浩
|
46e01e07a8
|
修改：CRM 商业智能，合并模块到 crm，优化查询
|
2 years ago |
|
芋道源码
|
acb8d3f23b
|
!858 CRM-客户: 完善客户导入
Merge pull request !858 from puhui999/develop
|
2 years ago |
|
YunaiV
|
6f95f37117
|
📖 CRM：code review 待进入公海的客户
|
2 years ago |
|
芋道源码
|
cd28128e42
|
!859 feat: CRM-backlog-待进入公海的客户
Merge pull request !859 from dhb52/crm-msg
|
2 years ago |
|
YunaiV
|
52a68e1838
|
📖 CRM：code review 合同金额排行榜、回款金额排行榜
|
2 years ago |
|
anhaohao
|
bfed37af6f
|
修改：CRM 商业智能，回款金额排行榜时间字段 bug
|
2 years ago |
|
puhui999
|
4418a7bebc
|
CRM-合同：完善新增合同插入关联的商品
|
2 years ago |
|
anhaohao
|
fdd5d55fc8
|
Merge remote-tracking branch 'origin/develop' into develop
|
2 years ago |
|
anhaohao
|
65d7f8c4ab
|
新增：CRM 商业智能，合同金额排行榜和回款金额排行榜
|
2 years ago |
|
puhui999
|
ea6752f15e
|
BPM: 新增通过流程标识获取流程图
|
2 years ago |
|
puhui999
|
1cab3c009c
|
CRM-合同：新增发起合同审批
|
2 years ago |
|
dhb52
|
5d8ca19b17
|
feat: CRM-backlog-待进入公海的客户
|
2 years ago |
|
YunaiV
|
ebd9222764
|
✨ ERP：初始化模块，立个 2024 年的 flag
|
2 years ago |
|
puhui999
|
a877bb4731
|
CRM-客户: 完善客户导入
|
2 years ago |
|
puhui999
|
4605e93105
|
CRM-客户: 完善客户导入
|
2 years ago |
|
puhui999
|
d8b2da8eed
|
CRM-客户: 完善 TODO
|
2 years ago |
|
YunaiV
|
d492daced4
|
📖 CRM：code review 跟进记录
|
2 years ago |
|
芋道源码
|
6a6f669c7f
|
!854 CRM：【线索】
Merge pull request !854 from Minh-X/develop
|
2 years ago |
|
YunaiV
|
814b6f688d
|
📖 CRM：code review 跟进记录
|
2 years ago |
Minh-X
|
11ce24ad1e
|
修改CrmClueRespVO字段描述
Signed-off-by: Minh-X <bluesfish@yeah.net>
|
2 years ago |
|
min
|
ce397d4fbd
|
CRM：【线索】增加字段
|
2 years ago |
|
puhui999
|
ed92bf45ce
|
CRM: 客户自动掉入公海
|
2 years ago |
|
puhui999
|
6850c7c71d
|
CRM: 完善跟进日志 TODO
|
2 years ago |
|
YunaiV
|
a86bce6f8b
|
📖 CRM：code review 商机模块
|
2 years ago |