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

6295 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
xiaqing
645fe827a3 Merge remote-tracking branch 'origin/feature/crm' into feature/crm 2023-11-08 10:47:42 +08:00
xiaqing
b06432b8f8 增加客户的公海领取和分配 2023-11-08 10:46:59 +08:00
YunaiV
2afc2caf1d 代码生成：主子表的部分实现 2023-11-08 09:42:16 +08:00
Wanwan
71574da2cf feat: CRM 客户公海配置 2023-11-08 00:42:46 +08:00
YunaiV
53afc9d50a codegen：移除多余的 test 类 2023-11-07 23:41:26 +08:00
jason
4ae3d34801 Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product 2023-11-07 23:11:25 +08:00
jason
15313c2992 转账 - 增加转账定时任务 2023-11-07 23:11:07 +08:00
Wanwan
4235beec3b Merge remote-tracking branch 'origin/feature/crm' into feature/crm 2023-11-07 22:54:54 +08:00
zhijiantianya@gmail.com
9705ae061c codegen：1）增加 vue3 + crud 模式下的单测；2）增加主子表的 db 字段 2023-11-07 20:43:53 +08:00
puhui999
668fae9398 CRM-数据权限：完善 code review 提到的问题 2023-11-07 17:52:18 +08:00
Wanwan
a24919e555 style: 客户 review 修改 2023-11-06 21:59:23 +08:00
YunaiV
e8bc284dd0 优化：默认只引入 mysql driver，减少打包大小 2023-11-06 21:41:28 +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
芋道源码
e63ae8e1e7
!719 添加达梦数据库适配指引 
Merge pull request !719 from dhb52/master
 2023-11-06 11:48:14 +00:00
YunaiV
feba904fd8 多租户：登录界面，根据 host 域名获取对应的租户编号 2023-11-06 19:47:21 +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
dhb52
24b9688894 doc: 添加达梦数据库适配指引 2023-11-06 00:15:16 +08:00
YunaiV
8efdf3141a code review：crm 商品逻辑 2023-11-05 20:47:56 +08:00
芋道源码
381b8ea63a
!716 【增加CRM：产品以及产品分类】 
Merge pull request !716 from ZanGe丶/feature/crm
 2023-11-05 12:28:22 +00:00
kehaiyou
9537669d01 fix: 去除无用行 2023-11-05 20:14:21 +08:00
YunaiV
370d6df473 完善 README.md，补全新的消息队列 2023-11-05 18:28:34 +08:00
YunaiV
023b592299 前端项目，独立仓库 2023-11-05 18:11:34 +08:00
kehaiyou
ca184026cf feat: 创建流程实例时，提前指派审批人 2023-11-05 14:21:37 +08:00
kehaiyou
b400aaac36 Merge remote-tracking branch 'upstream/master' 2023-11-05 13:26:38 +08:00
YunaiV
989d7c44d0 code review 店铺装修 2023-11-04 22:52:41 +08:00
YunaiV
1eff9822ce 同步最新 master 代码 2023-11-04 20:52:37 +08:00
YunaiV
787de1be94 Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/mall_product 
# Conflicts:
#	sql/mysql/mall.sql
#	sql/mysql/ruoyi-vue-pro.sql
#	yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/controller/app/wallet/vo/recharge/AppPayWalletRechargeCreateReqVO.java
#	yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/service/wallet/PayWalletRechargeServiceImpl.java
#	yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/social/SocialUserService.java
 2023-11-04 20:48:27 +08:00
YunaiV
f9e64a9f0a 同步最新 SQL 2023-11-04 20:43:18 +08:00
ZanGe丶
bf42f8e9ff 【增加CRM：产品以及产品分类】 2023-11-04 19:48:20 +08:00
YunaiV
87bc3f510c 优化：社交登录、用户的管理 2023-11-04 14:37:36 +08:00
YunaiV
e9317bf293 Merge branch 'feature/mall_product_tmp' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/mall_product 
# Conflicts:
#	yudao-module-member/yudao-module-member-biz/src/test/java/cn/iocoder/yudao/module/member/service/auth/MemberAuthServiceTest.java
#	yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/social/SocialUserServiceImpl.java
#	yudao-module-system/yudao-module-system-biz/src/test/java/cn/iocoder/yudao/module/system/service/social/SocialUserServiceImplTest.java
 2023-11-04 12:03:54 +08:00
芋道源码
01641cd1be
!696 新增社交客户端 CRUD,新增社交用户 RUD 
Merge pull request !696 from puhui999/feature/mall_product_tmp
 2023-11-04 04:00:12 +00:00
YunaiV
ecf728966f code review：客户逻辑 2023-11-04 10:13:43 +08:00
芋道源码
9ee6a27b86
!715 feat: 客户详情 + review 修改 
Merge pull request !715 from wanwan/feature/crm
 2023-11-04 01:39:34 +00:00
Wanwan
64db1a9c90 feat: 客户详情 + review 修改 2023-11-04 03:21:20 +08:00
芋道源码
e6d79eaf8d
!707 新增用户时，归属部门赋默认值 
Merge pull request !707 from 派森强哥/wgs
 2023-11-03 16:06:56 +00:00
YunaiV
acdfc28ee6 code review：客户锁定的逻辑 2023-11-03 23:43:04 +08:00
芋道源码
9a007de947
!713 新增接口 
Merge pull request !713 from Joey/feature/crm
 2023-11-03 15:37:55 +00:00
YunaiV
5bb91f139e Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/crm 2023-11-03 23:34:37 +08:00
YunaiV
b7900c2035 code review：回款逻辑 2023-11-03 23:02:01 +08:00
Joey
0a58790c6b 新增客户锁定和解锁 接口 2023-11-03 22:07:47 +08:00
Joey
fdaa08c258 Merge remote-tracking branch 'origin/feature/crm' 2023-11-03 21:46:10 +08:00
芋道源码
71ce831d59
!706 完善回款管理和回款计划功能 
Merge pull request !706 from souvc/feature/crm
 2023-11-03 11:16:48 +00:00
芋道源码
20b11092c2
!712 商城装修 
Merge pull request !712 from 疯狂的世界/feature/mall_product
 2023-11-03 11:04:53 +00:00
zhijiantianya@gmail.com
4092f298ed code review：crm 权限模块的实现 2023-11-03 18:53:40 +08:00
owen
bdfb5b8894 营销：装修页面适配 2023-11-03 09:18:04 +08:00
jason
cf114409b0 Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product 2023-11-03 08:43:40 +08:00
jason
f4d600398c 转账 - 管理后台增加转账单查询 2023-11-03 08:43:21 +08:00