iot-card-plus

1f35ef59d1 CRM：code review excel 导出的重构 YunaiV 2024-03-02 00:25:51 +0800
fc7734319b Merge branch 'develop' of https://gitee.com/puhui999/ruoyi-vue-pro into develop YunaiV 2024-03-01 23:46:50 +0800
379bd95840 CRM：code review 客户分析（客户总量分析） YunaiV 2024-03-01 23:37:07 +0800
2bf5c7a701

!889 feat: CRM/数据统计/员工客户分析初稿 Merge pull request !889 from dhb52/develop 芋道源码 2024-03-01 14:21:40 +0000
9928af52cf Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into master-jdk21 YunaiV 2024-03-01 20:03:19 +0800
dda0909843 🎉 2.0.1 版本发布！ YunaiV 2024-03-01 20:01:16 +0800
835bbe7e42 🎉 2.0.1 版本发布！ YunaiV 2024-03-01 19:40:37 +0800
7ef7228f65 MALL：增加返回 vipPrice 减免金额 YunaiV 2024-03-01 19:21:03 +0800
ca7b19c40b pom zhanhong 2024-03-01 19:06:24 +0800
0bd7d310a1 pom zhanhong 2024-03-01 19:05:54 +0800
7841fba59b fix:积木报表导出Excel报错（包冲突） zhanhong 2024-03-01 19:00:10 +0800
6846d429c0 re zhanhong 2024-03-01 18:59:49 +0800
01695567a1 re zhanhong 2024-03-01 18:59:11 +0800
a787f2a0cd fix:积木报表导出Excel报错（包冲突） zhanhong 2024-03-01 18:57:12 +0800
6b06bf8a3d bugfix MALL：已过期的优惠劵，还显示可以使用 YunaiV 2024-03-01 13:55:37 +0800
da6e01f6b5 bugfix：运行失败的单测 bugfix：PayOrderExtensionMapper 的 selectListByStatusAndCreateTimeGe 查询时间范围不对的问题 YunaiV 2024-03-01 12:26:05 +0800
d8bfed5c87 fix: 获取redis命令统计指令有误 YunaiV 2024-03-01 09:39:27 +0800
8a93a4d988 Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into develop YunaiV 2024-03-01 09:32:25 +0800
a4c7946830

!887 fix: 获取redis命令统计指令有误 Merge pull request !887 from dhb52/N/A 芋道源码 2024-03-01 01:32:08 +0000
9b7f71c203

!896 fix:跟进记录分页不显示商机 Merge pull request !896 from 李占宏/develop 芋道源码 2024-03-01 01:30:49 +0000
814acb83ae fix:跟进记录分页不显示商机 zhanhong 2024-03-01 09:28:06 +0800
8ff710e49d ✨ 同步 master 的一些 pr 代码变更 YunaiV 2024-03-01 09:00:43 +0800
34f68ce4c6 feat: CRM/数据统计/员工客户分析初稿 dhb52 2024-03-01 00:10:23 +0800
fbb624d826 feat: CRM/数据统计/员工客户分析/客户跟进次数分析 dhb52 2024-02-28 23:07:38 +0800
8b6bc7c54e Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into develop YunaiV 2024-02-28 23:04:18 +0800
b135314482

!890 修复：CRM 更新回款报错、待办事项中即将到期的合同查询报错、新增商机产品不显示 Merge pull request !890 from 李占宏/develop 芋道源码 2024-02-28 14:56:07 +0000
d183e75912 ✨ 2.0.1 版本发布准备 YunaiV 2024-02-28 22:35:25 +0800
74b5c48fcb Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into master-jdk21 YunaiV 2024-02-28 21:46:51 +0800
1f4889c68e ✨ 全局：将 dict 组件，融合到 excel 组件里，减少 starter YunaiV 2024-02-28 21:42:32 +0800
a0b413b3a3 refactor: CRM/数据统计/排行榜重命名 dhb52 2024-02-28 21:41:53 +0800
7d120a2f36 feat: CRM/数据统计/客户总量分析 dhb52 2024-02-28 21:41:10 +0800
6dcb1277b3 ✨ 全局：迁移 pay 组件到 pay 模块，迁移 flowable 组件到 bpm 模块 YunaiV 2024-02-28 21:03:40 +0800
0317e4279d ✨ 全局：简化 captcha 组件，融合到 system 模块 YunaiV 2024-02-28 20:31:55 +0800
0480cdf03f ✨ 全局：简化 file 组件，融合到 infra 模块 YunaiV 2024-02-28 19:17:00 +0800
77d634038c ✨ 全局：简化 file 组件，融合到 infra 模块 YunaiV 2024-02-28 18:59:33 +0800
720b54c353 CRM: 完善回款操作日志 puhui999 2024-02-28 11:25:06 +0800
b94cd08772 修复：CRM 新增商机产品不显示 CrmProductStatusEnum.ENABLE(1, "上架") CommonStatusEnum.DISABLE(1, "关闭"); zhanhong 2024-02-28 00:07:51 +0800
c3337f21ce fix：主子表 props puhui999 2024-02-28 00:07:25 +0800
89aca4572d 修复：CRM 合同配置不提醒，待办事项中即将到期的合同查询报错 zhanhong 2024-02-28 00:00:23 +0800
8222c3a831 修复：CRM 更新回款报错校验可回款金额超过上限需要用到不允许修改的字段的getContractId zhanhong 2024-02-27 23:51:26 +0800
c4ff0a1038 Merge remote-tracking branch 'yudao/develop' into develop puhui999 2024-02-27 21:28:23 +0800
067ff6cc4d ✨ bugfix master 的一些 pr YunaiV 2024-02-27 21:01:02 +0800
d134bfc4a6 ✨ 进一步同步 boot 和 cloud 代码，移除多余无用的类 YunaiV 2024-02-27 17:15:55 +0800
e4f1564ade

fix: 获取redis命令统计指令有误 dhb52 2024-02-27 08:22:19 +0000
2aade25e78 Merge branch 'develop' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into master-jdk21 YunaiV 2024-02-26 23:18:03 +0800
b285548b9d

!882 fix: 兼容有些21jdk getFirst 会找不到符合的错误 Merge pull request !882 from e7c_corp/N/A 芋道源码 2024-02-26 15:08:09 +0000
a6e13da602

fix: 兼容有些21jdk getFirst 会找不到符合的错误兼容有些21jdk getFirst 会找不到符合的错误 e7c_corp 2024-02-26 15:00:50 +0000
31e8777a7b ✨ CRM：更新最新代码，支持线索、客户、联系人、商机、合同等功能 YunaiV 2024-02-26 13:09:51 +0800
a390fb4519 ✨ CRM：更新最新代码，支持线索、客户、联系人、商机、合同等功能 YunaiV 2024-02-26 12:55:58 +0800
088fbb2096 Merge branch 'develop' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into master-jdk21 YunaiV 2024-02-26 12:25:55 +0800
cb8d4e0976 ✨ CRM：增加回款的待办事项逻辑 YunaiV 2024-02-26 12:24:40 +0800
a531ba2902 ✨ CRM：增加回款超过合同的退款金额校验 YunaiV 2024-02-26 09:27:13 +0800
dc695e3cda Merge remote-tracking branch 'yudao/develop' into develop puhui999 2024-02-25 22:32:37 +0800
462a4ee823 重构 excel 导入模版下拉生成逻辑使用字段注解的方式配置下拉选择 puhui999 2024-02-25 22:32:12 +0800
5fbb423621 ✨ CRM：完善合同的待回款金额 YunaiV 2024-02-25 20:50:37 +0800
33b056e6c4 ✨ CRM：完善回款的审批 YunaiV 2024-02-25 20:01:08 +0800
2890de8103 ✨ CRM：完善回款的新增/修改 YunaiV 2024-02-25 18:44:26 +0800
332eb30b6c ✨ CRM：完善回款列表 YunaiV 2024-02-25 16:52:13 +0800
91c179029f ✨ CRM：完善回款 plan 新增/修改 YunaiV 2024-02-25 16:09:16 +0800
ba47402a7f ✨ CRM：完善回款 plan 列表 YunaiV 2024-02-25 09:23:42 +0800
85c9524a2d

!880 CRM: 完善回款 Merge pull request !880 from puhui999/develop 芋道源码 2024-02-25 00:15:45 +0000
e5c3e69f5c CRM: 完善回款 puhui999 2024-02-25 02:11:19 +0800
b9ffb7833c Merge remote-tracking branch 'yudao/develop' into develop puhui999 2024-02-25 00:39:47 +0800
88cb683752 CRM: 完善回款 puhui999 2024-02-25 00:36:08 +0800
c726cd3aff ✨ CRM：将 bi 调整成 statistics YunaiV 2024-02-24 22:26:24 +0800
cd87f2e4aa ✨ CRM：code review 客户导出的实现 YunaiV 2024-02-24 19:57:26 +0800
e7bd2a568d ✨ CRM：增加商机关联联系人 YunaiV 2024-02-24 19:35:32 +0800
53ebd39c73 ✨ CRM：待办事项（接入合同） YunaiV 2024-02-24 17:55:40 +0800
0b0830f445 ✨ CRM：增加合同配置表 YunaiV 2024-02-24 16:51:16 +0800
616ae8eaeb Merge branch 'develop' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into develop YunaiV 2024-02-24 16:08:37 +0800
b6098cff83 ✨ CRM：商机接入合同列表 YunaiV 2024-02-24 16:08:07 +0800
29f1eb2c18 ✨ CRM：优化 CRM 跟进记录的实现 YunaiV 2024-02-24 15:46:57 +0800
67b091620d

!879 完善 Excel 导入模版下拉选择生成实现 Merge pull request !879 from puhui999/develop 芋道源码 2024-02-24 04:58:14 +0000
dd6981d901 Merge remote-tracking branch 'yudao/develop' into develop puhui999 2024-02-24 11:44:52 +0800
5dc1dbb3b2 完善 Excel 导入模版下拉选择生成实现 puhui999 2024-02-24 11:40:58 +0800
3f8fa6b1bc ✨ CRM：简化 CRM 数据权限的实现 YunaiV 2024-02-24 11:14:30 +0800
a8f6a3d324 ✨ CRM：完善 CRM 相关实现 YunaiV 2024-02-24 08:18:10 +0800
e53a0ca884 ✨ CRM：code review 客户导入 YunaiV 2024-02-23 18:50:22 +0800
a64da48aa3

!876 CRM：新增客户导入模版所属行业、客户等级、客户来源、客户地区单元格下拉选择 Merge pull request !876 from puhui999/develop 芋道源码 2024-02-23 07:01:08 +0000
be2431b73b CRM: 完善回款审批逻辑 puhui999 2024-02-23 14:37:03 +0800
eddd0a8801 Merge remote-tracking branch 'yudao/develop' into develop puhui999 2024-02-23 14:16:24 +0800
4066ad3e1a ✨ CRM：完善合同的审批逻辑 YunaiV 2024-02-23 12:59:16 +0800
5892c8897f CRM: 流程状态转换封装 puhui999 2024-02-23 12:20:08 +0800
0a97ff03c6 Merge remote-tracking branch 'yudao/develop' into develop puhui999 2024-02-23 12:16:37 +0800
c6b133d919 CRM: 完善回款 puhui999 2024-02-23 12:14:56 +0800
b3cfad9396 CRM: 完善回款计划 puhui999 2024-02-23 10:42:36 +0800
d604e76d16 ✨ CRM：完善合同的跟进记录实现 YunaiV 2024-02-23 09:31:41 +0800
b0def8b586 ✨ CRM：完善合同的新增、修改实现 YunaiV 2024-02-23 00:04:57 +0800
ef26b5e8dc ✨ CRM：完善合同的列表实现 YunaiV 2024-02-22 21:54:06 +0800
872fe53585 Merge remote-tracking branch 'yudao/develop' into develop puhui999 2024-02-22 21:26:28 +0800
c97c9f882e ✨ CRM：完成商机状态的变更 YunaiV 2024-02-22 20:41:28 +0800
0f2d974e9c Merge remote-tracking branch 'yudao/develop' into develop puhui999 2024-02-22 11:08:11 +0800
41b8575b8d CRM：完善客户导入 puhui999 2024-02-22 11:07:34 +0800
740e9297fa ✨ CRM：完善商机和联系人之间的关联 YunaiV 2024-02-22 09:35:57 +0800
b26eb6266f CRM：新增客户导入模版所属行业、客户等级、客户来源、客户地区单元格下拉选择 puhui999 2024-02-22 00:58:50 +0800
d9b0c9b4cf ✨ CRM：完善商机的跟进记录 YunaiV 2024-02-21 23:37:10 +0800
df2441def9

!875 完善 review 提到的问题 Merge pull request !875 from puhui999/develop 芋道源码 2024-02-21 14:57:22 +0000
1ad5602a19 Merge remote-tracking branch 'yudao/develop' into develop puhui999 2024-02-21 22:42:41 +0800
77f98c4d12 ✨ CRM：完善商机的新增、修改逻辑 YunaiV 2024-02-21 21:49:49 +0800
f76a7cd941 ✨ CRM：重构商机状态的代码实现，不调整表结构 YunaiV 2024-02-21 20:10:13 +0800

Commit Graph Select branches Hide Pull Requests bixuan master Mono Color

Commit Graph

Select branches

Hide Pull Requests

bixuan

master