Commit Graph

6432 Commits

Author SHA1 Message Date
芋道源码
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
芋道源码
cd28128e42
!859 feat: CRM-backlog-待进入公海的客户
Merge pull request !859 from dhb52/crm-msg
2024-01-30 04:14:32 +00:00
YunaiV
52a68e1838 📖 CRM:code review 合同金额排行榜、回款金额排行榜 2024-01-30 09:24:42 +08:00
芋道源码
278f220cef
!860 新增:CRM 商业智能,合同金额排行榜和回款金额排行榜
Merge pull request !860 from 安浩浩/develop
2024-01-30 00:34:50 +00:00
anhaohao
bfed37af6f 修改:CRM 商业智能,回款金额排行榜时间字段 bug 2024-01-28 21:47:52 +08:00
puhui999
4418a7bebc CRM-合同:完善新增合同插入关联的商品 2024-01-28 20:15:11 +08:00
anhaohao
fdd5d55fc8 Merge remote-tracking branch 'origin/develop' into develop 2024-01-28 20:11:00 +08:00
anhaohao
8d3ef13602 Merge remote-tracking branch 'origin/develop' into develop 2024-01-28 20:07:04 +08:00
anhaohao
65d7f8c4ab 新增:CRM 商业智能,合同金额排行榜和回款金额排行榜 2024-01-28 20:06:56 +08:00
anhaohao
ab43e89a48 修改:CRM 商业智能,合同金额排行榜和回款金额排行榜 2024-01-28 20:00:51 +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
6e005f46d9 ERP:【销售订单】初始化 2024-01-27 23:25:52 +08:00
YunaiV
ebd9222764 ERP:初始化模块,立个 2024 年的 flag 2024-01-27 17:25:07 +08:00
YunaiV
722223c659 Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into develop
# Conflicts:
#	yudao-module-mall/yudao-module-product-biz/src/test/java/cn/iocoder/yudao/module/product/service/comment/ProductCommentServiceImplTest.java
2024-01-27 16:44:58 +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
3367b4b6d4 Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/ruoyi-vue-pro 2024-01-27 13:09:40 +08:00
YunaiV
35205edff9 全局:将 sms 融合到 system 模块里,减少 starter 2024-01-27 13:09:25 +08:00
YunaiV
b56db8aebe Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/ruoyi-vue-pro 2024-01-27 13:06:37 +08:00
YunaiV
524ee8c467 全局:将 sms 融合到 system 模块里,减少 starter 2024-01-27 13:06:15 +08:00
YunaiV
ac0b18a808 Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/ruoyi-vue-pro 2024-01-27 11:27:04 +08:00
YunaiV
5acdd1554e 全局:将 sms 融合到 system 模块里,减少 starter 2024-01-27 11:25:43 +08:00
YunaiV
1b264365d3 Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/ruoyi-vue-pro 2024-01-27 10:26:22 +08:00
YunaiV
5b69df074c 全局:将 banner、error-code、desensitize 融合到 web 组件里,减少 starter 2024-01-27 10:25:25 +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
芋道源码
1a7be60503
!853 CRM: 完善跟进日志 TODO
Merge pull request !853 from puhui999/develop
2024-01-26 15:18:17 +00:00
芋道源码
913c4e413d
!856 解决deploy.sh里停服务无法正常显示服务名的问题
Merge pull request !856 from 杨宇庆/N/A
2024-01-26 15:15:15 +00:00
芋道源码
f9b9fbc670
!855 修复【短信发送过于频率】的拼写错误
Merge pull request !855 from 杨宇庆/N/A
2024-01-26 15:10:50 +00:00
YunaiV
8f2f0ea096 Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
# Conflicts:
#	pom.xml
#	yudao-dependencies/pom.xml
2024-01-26 20:38:12 +08:00
YunaiV
0dff03b8b1 🔥 2.0.0 版本发布准备~ 2024-01-26 20:37:38 +08:00
Minh-X
11ce24ad1e
修改CrmClueRespVO字段描述
Signed-off-by: Minh-X <bluesfish@yeah.net>
2024-01-25 14:17:24 +00:00
杨宇庆
443409f462
解决deploy.sh里停服务无法正常显示服务名的问题
解决deploy.sh里停服务无法正常显示服务名的问题

Signed-off-by: 杨宇庆 <hiyyq@qq.com>
2024-01-25 07:19:44 +00:00
杨宇庆
d611ebc0a2
修复【短信发送过于频率】的拼写错误
Signed-off-by: 杨宇庆 <hiyyq@qq.com>
2024-01-25 06:28:30 +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
7bb171512a 📖 BPM:code review 抄送逻辑 2024-01-23 12:55:13 +08:00
芋道源码
986f953319
!849 流程抄送Review
Merge pull request !849 from 云开/feature/BPM_CC_develop
2024-01-23 01:40:51 +00:00
YunaiV
a86bce6f8b 📖 CRM:code review 商机模块 2024-01-23 09:35:45 +08:00