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

502 Commits

Author SHA1 Message Date
YunaiV eb048532f7 Merge branch 'develop' of https://gitee.com/CrazyWorld/ruoyi-vue-pro into develop 
# Conflicts:
#	yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/app/article/AppArticleController.java
 2024-01-06 21:52:10 +08:00
zyna bd76ea59a7 Merge remote-tracking branch 'origin/feature/crm' into develop 
# Conflicts:
#	yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/business/CrmBusinessController.java
#	yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/contact/CrmContactController.java
#	yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/contactbusinesslink/CrmContactBusinessLinkController.java
#	yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/business/CrmBusinessService.java
#	yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/business/CrmBusinessServiceImpl.java
#	yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/contact/CrmContactBusinessLinkServiceImpl.java
#	yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/contact/CrmContactServiceImpl.java
 2023-12-17 17:47:46 +08:00
zyna 8434a8cd68 crm联系人商机功能修改 2023-12-17 17:33:52 +08:00
owen f374e778bb 商品：增加商品浏览记录 2023-12-17 17:20:08 +08:00
owen 4a007f0c98 统计：增加商品统计 2023-12-16 23:48:10 +08:00
liuhongfeng 0d3efe4f80 【优化】ureport2菜单，初始化数据，按照规范重新进行命名处理 2023-12-06 21:02:26 +08:00
liuhongfeng 9350523b35 【新增】ureport2菜单，初始化数据 2023-12-06 21:02:26 +08:00
liuhongfeng 7c43c3a2b1 【新增】ureport2 集成的SQL语句 2023-12-06 21:02:26 +08:00
liuhongfeng 8507fa9172 【新增】ureport2 集成 2023-12-06 21:02:25 +08:00
芋道源码 21a3870c00
!775 crm联系人商机功能 
Merge pull request !775 from zyna/feature/crm
 2023-12-06 05:57:51 +00:00
YunaiV 73e76ab453 Merge remote-tracking branch 'origin/master' into feature/crm 
# Conflicts:
#	yudao-module-crm/yudao-module-crm-biz/src/test/java/cn/iocoder/yudao/module/crm/service/contract/ContractServiceImplTest.java
#	yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dict/DictDataController.java
 2023-12-05 22:42:53 +08:00
zyna 910bc09e19 crm联系人商机功能 2023-12-03 20:01:00 +08:00
YunaiV 72969e921e crm: 增加基于客户查询回款计划分页 2023-12-01 22:46:13 +08:00
YunaiV f02b9464bd crm: 增加基于客户查询回款分页 2023-12-01 19:37:44 +08:00
YunaiV a5c59c6079 1.9.0 版本发布 2023-12-01 07:37:38 +08:00
YunaiV eeeafcc10c 1.9.0 版本发布 2023-11-30 21:14:13 +08:00
芋道源码 fa1aa51c96
!771 同步最新的 CRM 代码 
Merge pull request !771 from 芋道源码/feature/crm
 2023-11-30 12:50:49 +00:00
YunaiV 455f8e49fb crm：code review 联系人 2023-11-27 20:42:35 +08:00
zyna 3f3899f5d3 crm联系人review修改，新增地区字段 2023-11-27 20:42:34 +08:00
YunaiV 81f1800f40 优化对 dameng 工作流的适配 2023-11-26 19:19:31 +08:00
芋道源码 d07869f461
!723 feat: 达梦flowable 6.8适配 
Merge pull request !723 from dhb52/master
 2023-11-26 10:55:13 +00:00
YunaiV 3e9eb59de3 crm：code review 数据权限的实现 2023-11-25 10:55:47 +08:00
JiangQi 0955ad0fc0 promotion:combination-activity:query后多个tab 2023-11-22 09:22:40 +08:00
dhb52 edea17e781 Merge remote-tracking branch 'upstream/master' 2023-11-21 23:19:49 +08:00
YunaiV e40c0e3057 Merge branch 'feature/mall_product' of https://gitee.com/zhijiantianya/ruoyi-vue-pro 
# Conflicts:
#	pom.xml
#	sql/mysql/pay_wallet.sql
#	yudao-framework/yudao-spring-boot-starter-mybatis/src/main/java/cn/iocoder/yudao/framework/mybatis/core/mapper/BaseMapperX.java
 2023-11-19 18:39:55 +08:00
芋道源码 667957c941
!737 【修改】最新的SQL字符编码不一致导致创建表失败，修改utf8mb4_0900_ai_ci=》utf8mb4_unicode_ci 
Merge pull request !737 from souvc/master
 2023-11-18 16:57:03 +00:00
liuhongfeng 58ede7d69c 【修改】最新的SQL字符编码不一致导致创建表失败，修改utf8mb4_0900_ai_ci=》utf8mb4_unicode_ci 2023-11-18 23:30:24 +08:00
dhb52 677a6d348f Merge remote-tracking branch 'upstream/master' 2023-11-18 22:28:24 +08:00
YunaiV 8c9c91f0ca crm：code review 配置管理 2023-11-18 22:12:12 +08:00
YunaiV 90f135ad95 Merge branch 'feature/crm' of https://gitee.com/jiangwanwan/ruoyi-vue-pro into feature/crm 
# Conflicts:
#	sql/mysql/crm.sql
 2023-11-18 21:17:11 +08:00
YunaiV 5122aee924 Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/crm 
# Conflicts:
#	sql/mysql/ruoyi-vue-pro.sql
#	yudao-ui-admin/src/views/system/user/index.vue
 2023-11-18 20:44:06 +08:00
YunaiV 966690125b crm：code review 联系人 2023-11-18 20:43:32 +08:00
YunaiV 7ac74b44d8 同步最新 SQL 脚本 2023-11-18 17:49:01 +08:00
YunaiV ac80aa97b3 代码生成：优化前端模版的 package 路径 2023-11-18 17:41:37 +08:00
zyna 7af80ba248 crm联系人表结构 2023-11-11 23:32:42 +08:00
Wanwan 5b295d56b6 feat: CRM 客户限制 2023-11-11 20:49:52 +08:00
Wanwan 9abff2c7ad feat: CRM 客户公海配置 2023-11-08 23:16:55 +08:00
dhb52 cba0b08730 doc: 优化文档，patch文件可以放入任意启用的模块 2023-11-08 14:30:46 +08:00
dhb52 e04c4b11df feat: 达梦flowable 6.8适配 2023-11-08 13:09:49 +08:00
jason 4ae3d34801 Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product 2023-11-07 23:11:25 +08:00
YunaiV 9762a2a7c3 优化：默认只引入 mysql driver，减少打包大小 2023-11-06 21:17:27 +08:00
芋道源码 d48a236d4c
!720 1. 完善达梦的兼容性；2. 增加域名解析租户编号 
Merge pull request !720 from 芋道源码/feature/dameng
 2023-11-06 11:57:57 +00:00
YunaiV c162b39e1e 多租户：调整 tenant 表的 domain 字段为 website，避免 dm 数据库的关键字冲突 2023-11-06 19:04:01 +08:00
jason 09d45e6393 转账 - 增加转账通知 2023-11-06 11:33:08 +08:00
dhb52 24b9688894 doc: 添加达梦数据库适配指引 2023-11-06 00:15:16 +08:00
YunaiV 8efdf3141a code review：crm 商品逻辑 2023-11-05 20:47:56 +08:00
YunaiV f9e64a9f0a 同步最新 SQL 2023-11-04 20:43:18 +08:00
ZanGe丶 bf42f8e9ff 【增加CRM：产品以及产品分类】 2023-11-04 19:48:20 +08:00
jason f4d600398c 转账 - 管理后台增加转账单查询 2023-11-03 08:43:21 +08:00
liuhongfeng 921c2ab757 【新增】负责人 
【修改】规范命名：期数：indexNo-》period
 2023-10-30 21:33:28 +08:00
jason 48b1c19f28 Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product 2023-10-29 23:36:26 +08:00
jason ccccd9f226 转账 - 转账代码修改，新增转账示例 2023-10-29 23:36:06 +08:00
owen b5f9ed9edf 营销：装修SQL调整 2023-10-29 22:04:21 +08:00
YunaiV 054d80b472 code review：同步 crm 最新代码 2023-10-29 19:23:09 +08:00
YunaiV 53afce0bff code review：crm 回款 2023-10-29 19:22:09 +08:00
YunaiV 973b710992 code review：crm 商机 2023-10-29 19:14:15 +08:00
YunaiV d1978d318b code review：crm 合同 2023-10-29 19:05:36 +08:00
YunaiV fe50356ae8 code review：crm 客户模块的实现 2023-10-29 17:38:59 +08:00
YunaiV 0657c357bf Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/crm 2023-10-29 14:25:38 +08:00
Wanwan 3af9688383 feat: 调整客户表的字段 2023-10-29 00:33:42 +08:00
Wanwan c18f5baa4b feat: 调整客户表的字段 2023-10-28 22:47:56 +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
芋道源码 0719efb4c2
!695 feat: 客户表的 crud 
Merge pull request !695 from wanwan/feature/crm
 2023-10-27 14:41:38 +00:00
owen 3a2ccc9d6b 营销：装修模板、装修页面 2023-10-27 14:58:04 +08:00
ljlleo 75115bcc48 1、商机前端页面； 
2、商机状态类型和商机状态字段的处理；
 2023-10-26 16:22:44 +08:00
jason 626bd0bd55 转账 - code review 修改 2023-10-25 23:41:59 +08:00
Wanwan 04613af0cd feat: 客户表的 crud 2023-10-25 00:25:00 +08:00
YunaiV 3fdc132c17 1.8.3 版本发布 2023-10-24 20:53:37 +08:00
YunaiV df00126fa4 统一 boot 和 cloud 代码 2023-10-24 13:39:21 +08:00
jason 86598dd177 转账 - 动态收款人字段修改 2023-10-24 08:44:30 +08:00
zyna 918ffc40ae crm联系人前端init 2023-10-22 16:40:57 +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 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 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
jason 89e847c8cd 钱包，转账 review 修改 2023-10-21 15:28:07 +08:00
913752709@qq.com e4eeaa1d69 feat: crm 线索表完善 review 提到的问题 2023-10-21 00:53:18 +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
芋道源码 8bd1942083
!676 交易：核销订单 
Merge pull request !676 from 疯狂的世界/feature/mall_product
 2023-10-19 15:59:00 +00:00
YunaiV f8e4aece31 Merge branch 'feature/mall_product' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/mall_product 2023-10-19 23:31:21 +08:00
wanwan 48661f980c !679 feat: CRM 线索表 crud 
* feat: CRM 线索表 crud
* feat: CRM 线索表 crud
 2023-10-19 14:52:16 +00:00
YunaiV d256275099 saas：支持社交应用的多租户配置 2023-10-18 23:48:14 +08:00
913752709@qq.com a09ee495b6 feat: CRM 线索表 crud 2023-10-18 19:53:15 +08:00
zhijiantianya@gmail.com 00e18a480f code review：钱包、充值、转账的实现 2023-10-18 18:39:05 +08:00
owen 0c4713b7e0 Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product 
# Conflicts:
#	sql/mysql/mall.sql
 2023-10-17 23:29:11 +08:00
YunaiV 5842a361e2 同步最新 SQL 脚本 2023-10-17 23:23:17 +08:00
owen 0612a13cce 交易：核销订单 2023-10-17 23:18:08 +08:00
dhb52 164be5732b feat: CRM/合同管理 - SQL 2023-10-16 23:53:27 +08:00
YunaiV d2112458d2 Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product 2023-10-16 22:51:28 +08:00
YunaiV 1ff9bc6a71 code review：文章管理 2023-10-16 22:51:19 +08:00
jason 34210d3534 Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product 2023-10-16 22:43:54 +08:00
jason 7d0bcf5d3b wallet - 管理端钱包余额菜单脚本 2023-10-16 22:43:39 +08:00
owen 6f08645f61 会员：增加字段【注册终端】 2023-10-16 14:22:43 +08:00
owen df70402484 Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product 2023-10-16 09:55:17 +08:00
owen f5dac38ca5 商城：增加商城首页 2023-10-16 09:51:20 +08:00
jason 3db7b30e66 Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product 2023-10-16 08:46:44 +08:00
jason fcbbbc737d wallet - 管理端, 充值套餐脚本 2023-10-16 08:46:27 +08:00
YunaiV ca5e3f7bd1 优化最新的商城的 sql 2023-10-14 22:00:30 +08:00