huangge1199/vue-pro
1
0
Fork 0
mirror of https://gitee.com/huangge1199_admin/vue-pro.git synced 2024-11-25 16:51:52 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity
6,018 Commits 1 Branch 0 Tags 176 MiB
ca55282516
Commit Graph

455 Commits

Author SHA1 Message Date
YunaiV
ca55282516 CRM：商机 code review 2024-01-18 12:06:14 +08:00
lzxhqs
f361d05940 商机模块 2024-01-14 09:52:35 +08:00
YunaiV
bbba83ef61 📖 MALL：code review 商品统计的代码 2024-01-07 16:23:02 +08:00
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