p38192567
/
ruoyi-vue-pro1
mirror of https://gitee.com/zhijiantianya/ruoyi-vue-pro.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
5,290 Commits 8 Branches 31 Tags 233 MiB
Commit Graph

5290 Commits

Author SHA1 Message Date
Wanwan 3af9688383 feat: 调整客户表的字段 2023-10-29 00:33:42 +08:00
Wanwan c18f5baa4b feat: 调整客户表的字段 2023-10-28 22:47:56 +08:00
YunaiV 81b6aebf47 code review：商机表的实现 2023-10-27 23:27:08 +08:00
YunaiV bf247a6626 Merge branch 'feature/crm' of https://gitee.com/ljlleo/ruoyi-vue-pro into feature/crm 
# Conflicts:
#	sql/mysql/crm.sql
 2023-10-27 23:11:16 +08:00
YunaiV 74f786f8ed code review：客户表的实现 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
ljlleo 75115bcc48 1、商机前端页面； 
2、商机状态类型和商机状态字段的处理；
 2023-10-26 16:22:44 +08:00
Wanwan 866eaedfeb feat: 客户表的 crud 2023-10-25 00:32:49 +08:00
Wanwan 04613af0cd feat: 客户表的 crud 2023-10-25 00:25:00 +08:00
zyna 918ffc40ae crm联系人前端init 2023-10-22 16:40:57 +08:00
YunaiV 55f9e0131c code review：CRM 客户联系人的管理 2023-10-21 22:20:00 +08:00
YunaiV 723707c7ed Merge branch 'feature/crm' of https://gitee.com/zyna/ruoyi-vue-pro into feature/crm 
# Conflicts:
#	sql/mysql/crm.sql
#	yudao-module-crm/yudao-module-crm-api/src/main/java/cn/iocoder/yudao/module/crm/enums/ErrorCodeConstants.java
 2023-10-21 22:13:34 +08:00
YunaiV b5560fa0be code review：CRM 线索表的逻辑 2023-10-21 22:05:37 +08:00
YunaiV 9cf4cfca86 Merge branch 'feature/crm' of https://gitee.com/jiangwanwan/ruoyi-vue-pro into feature/crm 
# Conflicts:
#	sql/mysql/crm.sql
 2023-10-21 22:00:15 +08:00
YunaiV f942e2c7f2 code review：CRM 回款计划的逻辑 2023-10-21 21:55:21 +08:00
YunaiV 56b59cf383 Merge branch 'feature/crm' of https://gitee.com/souvc/ruoyi-vue-pro into feature/crm 
# Conflicts:
#	sql/mysql/crm.sql
#	sql/mysql/crm_menu.sql
#	yudao-module-crm/yudao-module-crm-api/src/main/java/cn/iocoder/yudao/module/crm/enums/ErrorCodeConstants.java
 2023-10-21 21:41:16 +08:00
YunaiV 6f8fd383f7 code review：CRM 商机的逻辑 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
913752709@qq.com e4eeaa1d69 feat: crm 线索表完善 review 提到的问题 2023-10-21 00:53:18 +08:00
913752709@qq.com 435d7dcfca Merge remote-tracking branch 'origin/feature/crm' into feature/crm 
# Conflicts:
#	yudao-module-crm/yudao-module-crm-api/src/main/java/cn/iocoder/yudao/module/crm/enums/ErrorCodeConstants.java
#	yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/clue/CrmClueController.java
#	yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/clue/vo/CrmClueBaseVO.java
#	yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/clue/vo/CrmCluePageReqVO.java
#	yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/dal/dataobject/clue/CrmClueDO.java
#	yudao-module-crm/yudao-module-crm-biz/src/test/java/cn/iocoder/yudao/module/crm/service/clue/CrmClueServiceImplTest.java
 2023-10-21 00:09:44 +08:00
liuhongfeng 34a5785768 【新增】回款计划 功能 2023-10-20 23:48:19 +08:00
zyna e4943f0dfa crm联系人 2023-10-20 23:42:22 +08:00
liuhongfeng 73f4fc8ceb 【新增】回款管理 功能 2023-10-20 22:16:34 +08:00
ljlleo 01490c879c 商机sql 2023-10-20 16:14:45 +08:00
ljlleo bee6f41211 商机 2023-10-20 16:01:54 +08:00
YunaiV 439edcd1be code review：crm 线索的 crud 2023-10-19 23:15:18 +08:00
wanwan 48661f980c !679 feat: CRM 线索表 crud 
* feat: CRM 线索表 crud
* feat: CRM 线索表 crud
 2023-10-19 14:52:16 +00:00
913752709@qq.com 1b6c8574cd feat: CRM 线索表 crud 2023-10-18 20:02:53 +08:00
913752709@qq.com a09ee495b6 feat: CRM 线索表 crud 2023-10-18 19:53:15 +08:00
YunaiV b133acd8cd code review：crm 合同流程 2023-10-17 22:52:14 +08:00
芋道源码 07f3d09e38
!671 CRM/合同管理 CRUD初稿 
Merge pull request !671 from dhb52/feature/crm
 2023-10-17 12:02:20 +00:00
dhb52 164be5732b feat: CRM/合同管理 - SQL 2023-10-16 23:53:27 +08:00
dhb52 eedb528412 feat: CRM/合同管理 - crud 2023-10-16 23:53:17 +08:00
dhb52 e26bd20a5b feat:添加测试配置及excel依赖 2023-10-16 23:45:18 +08:00
YunaiV 7e312aae02 初始化 crm 模块 2023-10-15 20:16:46 +08:00
芋道源码 82fd800ad2
!641 操作日志搜索参数名修改 
Merge pull request !641 from ligitee/N/A
 2023-10-14 09:52:11 +00:00
芋道源码 fa600dbb44
!662 【工作流】添加vue2版本的退回和委派前端代码 
Merge pull request !662 from LiuMoffett/moffett
 2023-10-14 09:51:00 +00:00
YunaiV 82545ddaac 优化 README.md，减少静态资源加载 2023-10-13 18:27:30 +08:00
YunaiV 04d491b90d 优化 README.md，减少静态资源加载 2023-10-13 09:39:40 +08:00
YunaiV 625504333b 优化 README.md 2023-10-13 09:35:23 +08:00
YunaiV 3105d86b7d 优化 README.md 2023-10-13 09:34:33 +08:00
YunaiV 7a9dbfe41d Merge remote-tracking branch 'origin/master' 2023-10-12 21:59:04 +08:00
YunaiV b30754a0a4 同步最新 mall 代码 2023-10-12 21:58:56 +08:00
YunaiV a72869b97e code review：修复部分统计报错 2023-10-12 21:54:06 +08:00
liuxiaolu 9a876cff3d feat:【工作流】添加vue2版本的退回和委派前端代码 2023-10-11 16:08:39 +08:00
YunaiV fef808d88c code review：统计代码 2023-10-11 12:32:28 +08:00
YunaiV 704087ce86 Merge branch 'feature/mall_product' of https://gitee.com/CrazyWorld/ruoyi-vue-pro into feature/mall_product 
# Conflicts:
#	yudao-module-mall/yudao-module-trade-api/src/main/java/cn/iocoder/yudao/module/trade/api/order/TradeOrderApi.java
#	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/api/order/TradeOrderApiImpl.java
 2023-10-11 11:30:03 +08:00
YunaiV 670a098aa8 code review：拼团记录流程 2023-10-11 11:04:22 +08:00
芋道源码 708af92a0f
!660 优化订单 OrderHandler 实现 
Merge pull request !660 from 芋道源码/feature/mall_product_tmp
 2023-10-10 23:51:10 +00:00