Commit Graph

  • c7b7741884 Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro YunaiV 2024-02-28 22:36:36 +08:00
  • d183e75912 2.0.1 版本发布准备 YunaiV 2024-02-28 22:35:25 +08:00
  • 74b5c48fcb Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into master-jdk21 YunaiV 2024-02-28 21:46:51 +08:00
  • c3717b68c8 Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/ruoyi-vue-pro YunaiV 2024-02-28 21:42:48 +08:00
  • 1f4889c68e 全局:将 dict 组件,融合到 excel 组件里,减少 starter YunaiV 2024-02-28 21:42:32 +08:00
  • a0b413b3a3 refactor: CRM/数据统计/排行榜 重命名 dhb52 2024-02-28 21:41:53 +08:00
  • 7d120a2f36 feat: CRM/数据统计/客户总量分析 dhb52 2024-02-28 21:41:10 +08:00
  • 91b3c16a90 Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/ruoyi-vue-pro YunaiV 2024-02-28 21:04:19 +08:00
  • 6dcb1277b3 全局:迁移 pay 组件到 pay 模块,迁移 flowable 组件到 bpm 模块 YunaiV 2024-02-28 21:03:40 +08:00
  • 0dc23d38b9 Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/ruoyi-vue-pro YunaiV 2024-02-28 20:32:16 +08:00
  • 0317e4279d 全局:简化 captcha 组件,融合到 system 模块 YunaiV 2024-02-28 20:31:55 +08:00
  • 2dc7376ec6 全局:简化 file 组件,融合到 infra 模块 YunaiV 2024-02-28 19:17:18 +08:00
  • 0480cdf03f 全局:简化 file 组件,融合到 infra 模块 YunaiV 2024-02-28 19:17:00 +08:00
  • 746133226f Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/ruoyi-vue-pro YunaiV 2024-02-28 19:08:05 +08:00
  • 77d634038c 全局:简化 file 组件,融合到 infra 模块 YunaiV 2024-02-28 18:59:33 +08:00
  • 720b54c353 CRM: 完善回款操作日志 puhui999 2024-02-28 11:25:06 +08:00
  • b94cd08772 修复:CRM 新增商机产品不显示 CrmProductStatusEnum.ENABLE(1, "上架") CommonStatusEnum.DISABLE(1, "关闭"); zhanhong 2024-02-28 00:07:51 +08:00
  • c3337f21ce fix:主子表 props puhui999 2024-02-28 00:07:25 +08:00
  • 89aca4572d 修复:CRM 合同配置不提醒,待办事项中即将到期的合同查询报错 zhanhong 2024-02-28 00:00:23 +08:00
  • 8222c3a831 修复:CRM 更新回款报错 校验可回款金额超过上限 需要用到 不允许修改的字段的getContractId zhanhong 2024-02-27 23:51:26 +08:00
  • c4ff0a1038 Merge remote-tracking branch 'yudao/develop' into develop puhui999 2024-02-27 21:28:23 +08:00
  • ece338846a Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/ruoyi-vue-pro YunaiV 2024-02-27 21:01:52 +08:00
  • 067ff6cc4d bugfix master 的一些 pr YunaiV 2024-02-27 21:01:02 +08:00
  • ccc0a09317
    !877 修正注释错误 Merge pull request !877 from moon69/master 芋道源码 2024-02-27 12:49:13 +00:00
  • 74a669f6aa
    !878 修复:错误的queryWrapper构建 Merge pull request !878 from oah/fixbug 芋道源码 2024-02-27 12:42:04 +00:00
  • d134bfc4a6 进一步同步 boot 和 cloud 代码,移除多余无用的类 YunaiV 2024-02-27 17:15:55 +08:00
  • e4f1564ade
    fix: 获取redis命令统计指令有误 dhb52 2024-02-27 08:22:19 +00:00
  • 2aade25e78 Merge branch 'develop' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into master-jdk21 YunaiV 2024-02-26 23:18:03 +08:00
  • b285548b9d
    !882 fix: 兼容有些21jdk getFirst 会找不到符合的错误 Merge pull request !882 from e7c_corp/N/A 芋道源码 2024-02-26 15:08:09 +00:00
  • a6e13da602
    fix: 兼容有些21jdk getFirst 会找不到符合的错误 兼容有些21jdk getFirst 会找不到符合的错误 e7c_corp 2024-02-26 15:00:50 +00:00
  • 02466aca2e 2.0.1 版本发布准备 YunaiV 2024-02-26 13:14:39 +08:00
  • 0c600a7358 Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/ruoyi-vue-pro YunaiV 2024-02-26 13:09:59 +08:00
  • 31e8777a7b CRM:更新最新代码,支持线索、客户、联系人、商机、合同等功能 YunaiV 2024-02-26 13:09:51 +08:00
  • 656c3a77ec Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/ruoyi-vue-pro YunaiV 2024-02-26 12:57:56 +08:00
  • a390fb4519 CRM:更新最新代码,支持线索、客户、联系人、商机、合同等功能 YunaiV 2024-02-26 12:55:58 +08:00
  • 088fbb2096 Merge branch 'develop' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into master-jdk21 YunaiV 2024-02-26 12:25:55 +08:00
  • cb8d4e0976 CRM:增加回款的待办事项逻辑 YunaiV 2024-02-26 12:24:40 +08:00
  • a531ba2902 CRM:增加回款超过合同的退款金额校验 YunaiV 2024-02-26 09:27:13 +08:00
  • dc695e3cda Merge remote-tracking branch 'yudao/develop' into develop puhui999 2024-02-25 22:32:37 +08:00
  • 462a4ee823 重构 excel 导入模版下拉生成逻辑使用字段注解的方式配置下拉选择 puhui999 2024-02-25 22:32:12 +08:00
  • 5fbb423621 CRM:完善合同的待回款金额 YunaiV 2024-02-25 20:50:37 +08:00
  • 33b056e6c4 CRM:完善回款的审批 YunaiV 2024-02-25 20:01:08 +08:00
  • 2890de8103 CRM:完善回款的新增/修改 YunaiV 2024-02-25 18:44:26 +08:00
  • 332eb30b6c CRM:完善回款列表 YunaiV 2024-02-25 16:52:13 +08:00
  • 91c179029f CRM:完善回款 plan 新增/修改 YunaiV 2024-02-25 16:09:16 +08:00
  • ba47402a7f CRM:完善回款 plan 列表 YunaiV 2024-02-25 09:23:42 +08:00
  • 85c9524a2d
    !880 CRM: 完善回款 Merge pull request !880 from puhui999/develop 芋道源码 2024-02-25 00:15:45 +00:00
  • e5c3e69f5c CRM: 完善回款 puhui999 2024-02-25 02:11:19 +08:00
  • b9ffb7833c Merge remote-tracking branch 'yudao/develop' into develop puhui999 2024-02-25 00:39:47 +08:00
  • 88cb683752 CRM: 完善回款 puhui999 2024-02-25 00:36:08 +08:00
  • c726cd3aff CRM:将 bi 调整成 statistics YunaiV 2024-02-24 22:26:24 +08:00
  • cd87f2e4aa CRM:code review 客户导出的实现 YunaiV 2024-02-24 19:57:26 +08:00
  • e7bd2a568d CRM:增加商机关联联系人 YunaiV 2024-02-24 19:35:32 +08:00
  • 53ebd39c73 CRM:待办事项(接入合同) YunaiV 2024-02-24 17:55:40 +08:00
  • 0b0830f445 CRM:增加合同配置表 YunaiV 2024-02-24 16:51:16 +08:00
  • 616ae8eaeb Merge branch 'develop' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into develop YunaiV 2024-02-24 16:08:37 +08:00
  • b6098cff83 CRM:商机接入合同列表 YunaiV 2024-02-24 16:08:07 +08:00
  • 29f1eb2c18 CRM:优化 CRM 跟进记录的实现 YunaiV 2024-02-24 15:46:57 +08:00
  • 67b091620d
    !879 完善 Excel 导入模版下拉选择生成实现 Merge pull request !879 from puhui999/develop 芋道源码 2024-02-24 04:58:14 +00:00
  • dd6981d901 Merge remote-tracking branch 'yudao/develop' into develop puhui999 2024-02-24 11:44:52 +08:00
  • 5dc1dbb3b2 完善 Excel 导入模版下拉选择生成实现 puhui999 2024-02-24 11:40:58 +08:00
  • 3f8fa6b1bc CRM:简化 CRM 数据权限的实现 YunaiV 2024-02-24 11:14:30 +08:00
  • a8f6a3d324 CRM:完善 CRM 相关实现 YunaiV 2024-02-24 08:18:10 +08:00
  • e53a0ca884 CRM:code review 客户导入 YunaiV 2024-02-23 18:50:22 +08:00
  • a64da48aa3
    !876 CRM:新增客户导入模版所属行业、客户等级、客户来源、客户地区单元格下拉选择 Merge pull request !876 from puhui999/develop 芋道源码 2024-02-23 07:01:08 +00:00
  • be2431b73b CRM: 完善回款审批逻辑 puhui999 2024-02-23 14:37:03 +08:00
  • eddd0a8801 Merge remote-tracking branch 'yudao/develop' into develop puhui999 2024-02-23 14:16:24 +08:00
  • 4066ad3e1a CRM:完善合同的审批逻辑 YunaiV 2024-02-23 12:59:16 +08:00
  • 5892c8897f CRM: 流程状态转换封装 puhui999 2024-02-23 12:20:08 +08:00
  • 0a97ff03c6 Merge remote-tracking branch 'yudao/develop' into develop puhui999 2024-02-23 12:16:37 +08:00
  • c6b133d919 CRM: 完善回款 puhui999 2024-02-23 12:14:56 +08:00
  • b3cfad9396 CRM: 完善回款计划 puhui999 2024-02-23 10:42:36 +08:00
  • d604e76d16 CRM:完善合同的跟进记录实现 YunaiV 2024-02-23 09:31:41 +08:00
  • b0def8b586 CRM:完善合同的新增、修改实现 YunaiV 2024-02-23 00:04:57 +08:00
  • ef26b5e8dc CRM:完善合同的列表实现 YunaiV 2024-02-22 21:54:06 +08:00
  • 872fe53585 Merge remote-tracking branch 'yudao/develop' into develop puhui999 2024-02-22 21:26:28 +08:00
  • c97c9f882e CRM:完成商机状态的变更 YunaiV 2024-02-22 20:41:28 +08:00
  • a345328a0c 修复:错误的queryWrapper构建 JUNHAO 2024-02-22 18:12:59 +08:00
  • a8ee4a85ce 修正注释错误 moon69 2024-02-22 12:53:59 +08:00
  • 0f2d974e9c Merge remote-tracking branch 'yudao/develop' into develop puhui999 2024-02-22 11:08:11 +08:00
  • 41b8575b8d CRM:完善客户导入 puhui999 2024-02-22 11:07:34 +08:00
  • 740e9297fa CRM:完善商机和联系人之间的关联 YunaiV 2024-02-22 09:35:57 +08:00
  • b26eb6266f CRM:新增客户导入模版所属行业、客户等级、客户来源、客户地区单元格下拉选择 puhui999 2024-02-22 00:58:50 +08:00
  • d9b0c9b4cf CRM:完善商机的跟进记录 YunaiV 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
  • 1ad5602a19 Merge remote-tracking branch 'yudao/develop' into develop puhui999 2024-02-21 22:42:41 +08:00
  • 77f98c4d12 CRM:完善商机的新增、修改逻辑 YunaiV 2024-02-21 21:49:49 +08:00
  • f76a7cd941 CRM:重构商机状态的代码实现,不调整表结构 YunaiV 2024-02-21 20:10:13 +08:00
  • e01dda9baf CRM:完善商机的列表 YunaiV 2024-02-21 18:45:10 +08:00
  • 9878ebbf3b fix: 错误码bug colorfulgray0 2024-02-21 15:24:02 +08:00
  • 02b63de808 CRM:完善 review 提到的问题 puhui999 2024-02-21 14:27:25 +08:00
  • 7dd35f3295 CRM:完善联系人的编辑、详情 YunaiV 2024-02-20 23:32:26 +08:00
  • 66a34a6d90 CRM:完善联系人的列表 YunaiV 2024-02-20 21:18:45 +08:00
  • 4b41c3c692 CRM:优化客户的 backlog 逻辑 YunaiV 2024-02-20 20:19:59 +08:00
  • b444312ea8 CRM:优化客户的过期到公海的逻辑 YunaiV 2024-02-20 19:07:48 +08:00
  • 3e6524932b CRM:优化客户的详情、更新成交状态 YunaiV 2024-02-20 12:55:44 +08:00
  • 69a974ef02 📖 CRM:线索的跟进逻辑 YunaiV 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
  • 38e410cae0 📖 CRM:线索的转化逻辑 YunaiV 2024-02-19 20:41:10 +08:00
  • fe330482b3 📖 CRM:线索 clue 新增/修改的完善 YunaiV 2024-02-19 19:02:12 +08:00