huangge1199/vue-pro
1
0
Fork 0
mirror of https://gitee.com/huangge1199_admin/vue-pro.git synced 2024-11-22 23:31:52 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity
5,624 Commits 1 Branch 0 Tags 176 MiB
edea17e781
Commit Graph

223 Commits

Author SHA1 Message Date
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
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
jason
4ae3d34801 Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product 2023-11-07 23:11:25 +08: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
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