dhb52
|
06c0d86544
|
fix: 使用convertSetByFlatMap避免 ID 重复
Signed-off-by: dhb52 <dhb52@126.com>
|
2024-03-05 15:08:40 +00:00 |
|
dhb52
|
a23ea45632
|
fix: [CRM-客户统计]根据Code-Review 修改
|
2024-03-04 23:51:25 +08:00 |
|
puhui999
|
ba1b028001
|
CRM：完善数据权限，实现数据权限同时添加、同时转移
|
2024-03-03 20:10:30 +08:00 |
|
E1
|
79c51c6433
|
修复 Java21版本下docker-compose中Redis Host参数名称不正确的问题
Signed-off-by: E1 <876394202@qq.com>
|
2024-03-03 10:26:28 +00:00 |
|
puhui999
|
f56fab932a
|
CRM：完善 excel 导出 review 提到的问题
|
2024-03-02 23:24:42 +08:00 |
|
zhanhong
|
29b7106985
|
fix:包冲突 积木报表 导出Excel报错
|
2024-03-02 13:26:05 +08:00 |
|
zhanhong
|
1e13365ef4
|
pom
|
2024-03-02 13:23:54 +08:00 |
|
zhanhong
|
e7cc305362
|
Merge remote-tracking branch 'origin/develop' into develop
|
2024-03-02 13:23:05 +08:00 |
|
YunaiV
|
1f35ef59d1
|
CRM：code review excel 导出的重构
|
2024-03-02 00:25:51 +08:00 |
|
YunaiV
|
fc7734319b
|
Merge branch 'develop' of https://gitee.com/puhui999/ruoyi-vue-pro into develop
# 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/service/receivable/CrmReceivableServiceImpl.java
|
2024-03-01 23:46:50 +08:00 |
|
YunaiV
|
379bd95840
|
CRM：code review 客户分析（客户总量分析）
|
2024-03-01 23:37:07 +08:00 |
|
芋道源码
|
2bf5c7a701
|
!889 feat: CRM/数据统计/员工客户分析 初稿
Merge pull request !889 from dhb52/develop
|
2024-03-01 14:21:40 +00:00 |
|
YunaiV
|
dda0909843
|
🎉 2.0.1 版本发布！
|
2024-03-01 20:01:16 +08:00 |
|
YunaiV
|
835bbe7e42
|
🎉 2.0.1 版本发布！
|
2024-03-01 19:40:37 +08:00 |
|
YunaiV
|
7ef7228f65
|
MALL：增加返回 vipPrice 减免金额
|
2024-03-01 19:21:03 +08:00 |
|
zhanhong
|
ca7b19c40b
|
pom
|
2024-03-01 19:06:24 +08:00 |
|
zhanhong
|
0bd7d310a1
|
pom
|
2024-03-01 19:05:54 +08:00 |
|
zhanhong
|
7841fba59b
|
fix:积木报表导出Excel报错（包冲突）
|
2024-03-01 19:00:10 +08:00 |
|
zhanhong
|
6846d429c0
|
re
|
2024-03-01 18:59:49 +08:00 |
|
zhanhong
|
01695567a1
|
re
|
2024-03-01 18:59:11 +08:00 |
|
zhanhong
|
a787f2a0cd
|
fix:积木报表导出Excel报错（包冲突）
|
2024-03-01 18:57:12 +08:00 |
|
YunaiV
|
6b06bf8a3d
|
bugfix MALL：已过期的优惠劵，还显示可以使用
|
2024-03-01 13:55:37 +08:00 |
|
YunaiV
|
da6e01f6b5
|
bugfix：运行失败的单测
bugfix：PayOrderExtensionMapper 的 selectListByStatusAndCreateTimeGe 查询时间范围不对的问题
|
2024-03-01 12:26:05 +08:00 |
|
YunaiV
|
d8bfed5c87
|
fix: 获取redis命令统计指令有误
|
2024-03-01 09:39:27 +08:00 |
|
YunaiV
|
8a93a4d988
|
Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into develop
|
2024-03-01 09:32:25 +08:00 |
|
芋道源码
|
a4c7946830
|
!887 fix: 获取redis命令统计指令有误
Merge pull request !887 from dhb52/N/A
|
2024-03-01 01:32:08 +00:00 |
|
芋道源码
|
9b7f71c203
|
!896 fix:跟进记录分页不显示商机
Merge pull request !896 from 李占宏/develop
|
2024-03-01 01:30:49 +00:00 |
|
zhanhong
|
814acb83ae
|
fix:跟进记录分页不显示商机
|
2024-03-01 09:28:06 +08:00 |
|
YunaiV
|
8ff710e49d
|
✨ 同步 master 的一些 pr 代码变更
|
2024-03-01 09:00:43 +08:00 |
|
dhb52
|
34f68ce4c6
|
feat: CRM/数据统计/员工客户分析 初稿
|
2024-03-01 00:10:23 +08:00 |
|
dhb52
|
fbb624d826
|
feat: CRM/数据统计/员工客户分析/客户跟进次数分析
|
2024-02-28 23:07:38 +08:00 |
|
YunaiV
|
8b6bc7c54e
|
Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into develop
|
2024-02-28 23:04:18 +08:00 |
|
芋道源码
|
b135314482
|
!890 修复：CRM 更新回款报错、待办事项中即将到期的合同查询报错、新增商机产品不显示
Merge pull request !890 from 李占宏/develop
|
2024-02-28 14:56:07 +00:00 |
|
YunaiV
|
1f4889c68e
|
✨ 全局：将 dict 组件，融合到 excel 组件里，减少 starter
|
2024-02-28 21:42:32 +08:00 |
|
dhb52
|
a0b413b3a3
|
refactor: CRM/数据统计/排行榜 重命名
|
2024-02-28 21:41:53 +08:00 |
|
dhb52
|
7d120a2f36
|
feat: CRM/数据统计/客户总量分析
|
2024-02-28 21:41:10 +08:00 |
|
YunaiV
|
6dcb1277b3
|
✨ 全局：迁移 pay 组件到 pay 模块，迁移 flowable 组件到 bpm 模块
|
2024-02-28 21:03:40 +08:00 |
|
YunaiV
|
0317e4279d
|
✨ 全局：简化 captcha 组件，融合到 system 模块
|
2024-02-28 20:31:55 +08:00 |
|
YunaiV
|
0480cdf03f
|
✨ 全局：简化 file 组件，融合到 infra 模块
|
2024-02-28 19:17:00 +08:00 |
|
YunaiV
|
77d634038c
|
✨ 全局：简化 file 组件，融合到 infra 模块
|
2024-02-28 18:59:33 +08:00 |
|
puhui999
|
720b54c353
|
CRM: 完善回款操作日志
|
2024-02-28 11:25:06 +08:00 |
|
zhanhong
|
b94cd08772
|
修复：CRM 新增商机产品不显示 CrmProductStatusEnum.ENABLE(1, "上架") CommonStatusEnum.DISABLE(1, "关闭");
|
2024-02-28 00:07:51 +08:00 |
|
puhui999
|
c3337f21ce
|
fix：主子表 props
|
2024-02-28 00:07:25 +08:00 |
|
zhanhong
|
89aca4572d
|
修复：CRM 合同配置不提醒，待办事项中即将到期的合同查询报错
|
2024-02-28 00:00:23 +08:00 |
|
zhanhong
|
8222c3a831
|
修复：CRM 更新回款报错 校验可回款金额超过上限 需要用到 不允许修改的字段的getContractId
|
2024-02-27 23:51:26 +08:00 |
|
puhui999
|
c4ff0a1038
|
Merge remote-tracking branch 'yudao/develop' into develop
|
2024-02-27 21:28:23 +08:00 |
|
YunaiV
|
067ff6cc4d
|
✨ bugfix master 的一些 pr
|
2024-02-27 21:01:02 +08:00 |
|
YunaiV
|
d134bfc4a6
|
✨ 进一步同步 boot 和 cloud 代码，移除多余无用的类
|
2024-02-27 17:15:55 +08:00 |
|
dhb52
|
e4f1564ade
|
fix: 获取redis命令统计指令有误
Signed-off-by: dhb52 <dhb52@126.com>
|
2024-02-27 08:22:19 +00:00 |
|
YunaiV
|
2aade25e78
|
Merge branch 'develop' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into master-jdk21
|
2024-02-26 23:18:03 +08:00 |
|