Commit Graph

Select branches

Hide Pull Requests

main

Mono Color

• 67ac11b56c code review：crm 客户转移 YunaiV 2023-10-29 18:39:54 +08:00
• 9608cf0539 Merge branch 'feature/crm' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/crm liuhongfeng 2023-10-29 18:03:01 +08:00
• 677e8ab2fc 【修改】回款计划-修改字段类型 【修改】修改回款计划-创建逻辑，添加客户的数据校验 liuhongfeng 2023-10-29 18:00:34 +08:00
• f73b857551 !702 CRM【商机】【联系人】【合同】新增 transfer 接口 Merge pull request !702 from puhui999/feature/crm 芋道源码 2023-10-29 09:55:09 +00:00
• fe50356ae8 code review：crm 客户模块的实现 YunaiV 2023-10-29 17:38:59 +08:00
• 0657c357bf Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/crm YunaiV 2023-10-29 14:25:38 +08:00
• d8e49fa0f6 !701 feat: 调整 CRM 客户表的字段 Merge pull request !701 from wanwan/feature/crm 芋道源码 2023-10-29 02:36:55 +00:00
• 722e9c8a04 CRM-商机：新增商机转移接口 puhui999 2023-10-29 02:04:26 +08:00
• 36a76c5ce6 CRM-联系人：新增联系人转移接口 puhui999 2023-10-29 01:42:22 +08:00
• d9f6fb241a 合同：新增合同转移接口 puhui999 2023-10-29 01:23:06 +08:00
• 3af9688383 feat: 调整客户表的字段 Wanwan 2023-10-29 00:33:42 +08:00
• c18f5baa4b feat: 调整客户表的字段 Wanwan 2023-10-28 22:47:56 +08:00
• f4ea648ac9 fix: 修复PayWalletRechargeCerate参数校验 Jayson Albert 2023-10-28 19:45:06 +08:00
• b0ddd522fb Merge branch 'feature/crm' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/crm liuhongfeng 2023-10-28 00:37:59 +08:00
• 301f497527 【新增】回款计划-审批枚举类 【新增】回款计划-回款方式枚举类 【新增】回款计划-枚举类校验 【修改】回款计划-错误码调整 【修改】修改回款计划-创建逻辑，添加合同数据的校验 liuhongfeng 2023-10-28 00:37:47 +08:00
• 81b6aebf47 code review：商机表的实现 YunaiV 2023-10-27 23:27:08 +08:00
• bf247a6626 Merge branch 'feature/crm' of https://gitee.com/ljlleo/ruoyi-vue-pro into feature/crm YunaiV 2023-10-27 23:11:16 +08:00
• 74f786f8ed code review：客户表的实现 YunaiV 2023-10-27 22:56:46 +08:00
• 0719efb4c2 !695 feat: 客户表的 crud Merge pull request !695 from wanwan/feature/crm 芋道源码 2023-10-27 14:41:38 +00:00
• ecb36eef67 !691 crm联系人前端 Merge pull request !691 from zyna/feature/crm 芋道源码 2023-10-27 14:33:38 +00:00
• 3a2ccc9d6b 营销：装修模板、装修页面 owen 2023-10-23 22:10:54 +08:00
• 8552e86d8a 完善三方登录 puhui999 2023-10-26 17:03:26 +08:00
• 75115bcc48 1、商机前端页面； 2、商机状态类型和商机状态字段的处理； ljlleo 2023-10-26 16:22:44 +08:00
• 5f29399cf4 Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product jason 2023-10-25 23:42:25 +08:00
• 626bd0bd55 转账 - code review 修改 jason 2023-10-25 23:41:59 +08:00
• 12ae5bf128 新增社交用户 RUD puhui999 2023-10-25 16:57:13 +08:00
• 738fcef453 新增社交客户端 CRUD puhui999 2023-10-25 16:07:17 +08:00
• eb4b719b4b 添加社交客户端测试 sql puhui999 2023-10-25 15:09:34 +08:00
• 866eaedfeb feat: 客户表的 crud Wanwan 2023-10-25 00:32:49 +08:00
• 04613af0cd feat: 客户表的 crud Wanwan 2023-10-25 00:25:00 +08:00
• 126dc610b1 1.8.3 版本发布 YunaiV 2023-10-24 23:14:14 +08:00
• 3fdc132c17 1.8.3 版本发布 YunaiV 2023-10-24 20:53:37 +08:00
• 3a9ac56f96 修复 banner 返回字段不对 YunaiV 2023-10-24 20:29:15 +08:00
• c11300d33a 解决启动问题 YunaiV 2023-10-24 19:54:49 +08:00
• a4aa1fac0b Merge branch 'feature/v2.7.17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro YunaiV 2023-10-24 19:13:09 +08:00
• 52e735f360 Merge branch 'feature/mall_product' of https://gitee.com/zhijiantianya/ruoyi-vue-pro YunaiV 2023-10-24 19:09:01 +08:00
• 07dbfc5546 code review：sign 签到逻辑 YunaiV 2023-10-24 19:08:08 +08:00
• c7695def5e !694 完善 review 提到的问题，商品模块移除对营销模块的依赖 Merge pull request !694 from puhui999/feature/mall_product 芋道源码 2023-10-24 10:49:13 +00:00
• dd2f5ba2c3 统一 boot 和 cloud 代码 YunaiV 2023-10-24 18:48:02 +08:00
• ff3b1e942a Banner: market ==> promotion puhui999 2023-10-24 18:00:35 +08:00
• d9a5ef3321 统一 boot 和 cloud 代码 YunaiV 2023-10-24 13:58:35 +08:00
• df00126fa4 统一 boot 和 cloud 代码 YunaiV 2023-10-24 13:39:21 +08:00
• af788e36ce bpm：code review YunaiV 2023-10-24 08:47:46 +08:00
• 86598dd177 转账 - 动态收款人字段修改 jason 2023-10-24 08:44:30 +08:00
• fc2d30cfaf pay：修复单元测试报错 YunaiV 2023-10-24 08:09:47 +08:00
• 7bff98b658 统一 boot 和 cloud 代码 YunaiV 2023-10-23 23:48:06 +08:00
• 9095394fed 钱包 - 创建钱包充值校验修改 jason 2023-10-23 21:47:36 +08:00
• 633a4c5687 pay：微调 enum 的包名 YunaiV 2023-10-23 19:56:30 +08:00
• 054569a3d3 promotion：去除已经不使用的代码 YunaiV 2023-10-23 19:24:04 +08:00
• 3672d0f245 商品模块移除对营销模块的依赖 puhui999 2023-10-23 17:29:26 +08:00
• 6723cae781 营销活动：完善 review 提到的问题 puhui999 2023-10-23 12:02:13 +08:00
• a39a0e68a0 fix: vben codegen xingyu 2023-10-23 11:49:23 +08:00
• 98561731f5 chore: update deps xingyu 2023-10-23 11:38:55 +08:00
• f0d3614c34 fix: reset config xingyu 2023-10-23 11:38:41 +08:00
• 1611dd4b23 docs: up springboot 2.7.17 xingyu 2023-10-23 11:38:28 +08:00
• f3f2efcced feat: update springboot 2.7.17 xingyu 2023-10-23 11:38:01 +08:00
• a778c25075 product：优化代码实现，简化重复判空 YunaiV 2023-10-22 21:44:05 +08:00
• 918ffc40ae crm联系人前端init zyna 2023-10-22 16:40:57 +08:00
• 728308cbc0 member：优化部分变量的命名 YunaiV 2023-10-22 16:35:48 +08:00
• 94c2ad5d1d 修复报错的单元测试 YunaiV 2023-10-22 08:55:27 +08:00
• d0caa77f80 Merge branch 'feature/mall_product' of https://gitee.com/zhijiantianya/ruoyi-vue-pro YunaiV 2023-10-22 08:25:27 +08:00
• ec27a1bae5 修复报错的单元测试 YunaiV 2023-10-22 08:24:47 +08:00
• 55f9e0131c code review：CRM 客户联系人的管理 YunaiV 2023-10-21 22:20:00 +08:00
• 723707c7ed Merge branch 'feature/crm' of https://gitee.com/zyna/ruoyi-vue-pro into feature/crm YunaiV 2023-10-21 22:13:34 +08:00
• b5560fa0be code review：CRM 线索表的逻辑 YunaiV 2023-10-21 22:05:37 +08:00
• 9cf4cfca86 Merge branch 'feature/crm' of https://gitee.com/jiangwanwan/ruoyi-vue-pro into feature/crm YunaiV 2023-10-21 22:00:15 +08:00
• f942e2c7f2 code review：CRM 回款计划的逻辑 YunaiV 2023-10-21 21:55:21 +08:00
• 56b59cf383 Merge branch 'feature/crm' of https://gitee.com/souvc/ruoyi-vue-pro into feature/crm YunaiV 2023-10-21 21:41:16 +08:00
• 6f8fd383f7 code review：CRM 商机的逻辑 YunaiV 2023-10-21 21:35:35 +08:00
• 24e6deb82b !682 商机 Merge pull request !682 from 刘先生/feature/crm 芋道源码 2023-10-21 13:19:46 +00:00
• 9697aee898 code review：钱包的逻辑 YunaiV 2023-10-21 21:17:49 +08:00
• 3bb3e4caf6 code review：工作流的加减签 YunaiV 2023-10-21 21:04:20 +08:00
• cc67174f87 !689 【工作流】--加签减签review Merge pull request !689 from Youkehai/feature/bpm-addSignAndSubSign 芋道源码 2023-10-21 11:59:22 +00:00
• 0db4581030 code review：签到逻辑 YunaiV 2023-10-21 19:56:53 +08:00
• 3e570b8b89 !685 完善遗留的问题 Merge pull request !685 from puhui999/feature/mall_product 芋道源码 2023-10-21 11:31:56 +00:00
• 6dfef29834 feat: 控制查找子任务次数和清除递归代码 kehaiyou 2023-10-21 18:31:30 +08:00
• aca65a66b5 feat: 【工作流】--加减签review修改 kehaiyou 2023-10-21 18:16:21 +08:00
• 785fbeeb5b code review：限时折扣活动 YunaiV 2023-10-21 18:16:09 +08:00
• 90fb2c62b8 !683 mall模块 Merge pull request !683 from zxiaoxiu/discount 芋道源码 2023-10-21 09:23:50 +00:00
• 0e754a9924 Merge remote-tracking branch 'yudao/feature/mall_product' into feature/mall_product puhui999 2023-10-21 17:09:24 +08:00
• f363c598d8 Banner：完善 review 提到的问题 puhui999 2023-10-21 17:09:04 +08:00
• 89e847c8cd 钱包，转账 review 修改 jason 2023-10-21 15:28:07 +08:00
• 1bb2010dc0 签到记录：完善 review 提到的问题 puhui999 2023-10-21 01:11:10 +08:00
• 2f7371b4ea 签到记录：完善 review 提到的问题 puhui999 2023-10-21 01:01:06 +08:00
• e4eeaa1d69 feat: crm 线索表完善 review 提到的问题 913752709@qq.com 2023-10-21 00:53:18 +08:00
• 435d7dcfca Merge remote-tracking branch 'origin/feature/crm' into feature/crm 913752709@qq.com 2023-10-21 00:09:44 +08:00
• 34a5785768 【新增】回款计划 功能 liuhongfeng 2023-10-20 23:48:19 +08:00
• e4943f0dfa crm联系人 zyna 2023-10-20 23:42:22 +08:00
• db0fbf0596 Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product jason 2023-10-20 23:22:16 +08:00
• 183206e2d3 转账 - 支付宝转账修改, 支付宝 Client 支持公钥证书模式 jason 2023-10-20 23:20:47 +08:00
• f18a4741a9 营销活动：完善 review 提到的问题 puhui999 2023-10-20 22:32:37 +08:00
• 73f4fc8ceb 【新增】回款管理 功能 liuhongfeng 2023-10-20 22:16:34 +08:00
• f462ac7f96 Merge remote-tracking branch 'yudao/feature/mall_product' into feature/mall_product puhui999 2023-10-20 21:04:47 +08:00
• 04061b028c mall模块-限时折扣功能 zhangshuai 2023-10-20 20:54:16 +08:00
• 283ca908b7 SPU: 完善选择优惠卷 puhui999 2023-10-20 16:35:49 +08:00
• 01490c879c 商机sql ljlleo 2023-10-20 16:14:45 +08:00
• bee6f41211 商机 ljlleo 2023-10-20 16:01:54 +08:00
• 6e11154010 SPU: 添加选择优惠卷 puhui999 2023-10-20 11:35:16 +08:00
• 52ebcaaad7 同步 https://gitee.com/zhijiantianya/yudao-cloud/pulls/59/ YunaiV 2023-10-20 00:31:35 +08:00
• 6c8e82ca5a code review：自提统计 YunaiV 2023-10-20 00:30:27 +08:00