Commit Graph

5607 Commits

Author SHA1 Message Date
YunaiV
a4b1395e92 代码生成:主子表(inner)部分模版 2023-11-13 09:52:48 +08:00
YunaiV
256c560d43 代码生成:增加主子表的示例 2023-11-12 22:33:18 +08:00
YunaiV
e67a6a2fe9 代码生成:1)增加 one 情况下的示例代码;2)修复 vue3 模版现有的 bug 2023-11-12 19:50:20 +08:00
Wanwan
322411304c feat: CRM 客户限制 2023-11-12 14:34:49 +08:00
YunaiV
07e71e2ab0 代码生成:主子表 normal 模式,1 对 1 的 form 生成 2023-11-12 00:15:44 +08:00
zyna
7af80ba248 crm联系人表结构 2023-11-11 23:32:42 +08:00
zyna
7598ed05cf crm联系人第二版新增字段 2023-11-11 23:31:09 +08:00
YunaiV
0a8257a565 代码生成:主子表 normal 模式,1 对多的 form 生成 2023-11-11 22:06:38 +08:00
Wanwan
5b295d56b6 feat: CRM 客户限制 2023-11-11 20:49:52 +08:00
YunaiV
055eb350aa 代码生成:简化现有 crud 模版的各种 pretty 相关的判断,交给 Java 代码后置统一处理。 2023-11-11 12:56:58 +08:00
YunaiV
ebb8f04fb5 Merge remote-tracking branch 'origin/feature/sub-table' into feature/sub-table 2023-11-09 22:47:43 +08:00
zhijiantianya@gmail.com
7c09a1fc86 代码生成器:主子表,支持普通、内嵌、ERP 三种模式 2023-11-09 20:49:52 +08:00
Wanwan
2915b46fa5 feat: CRM 客户公海配置 2023-11-09 00:01:43 +08:00
Wanwan
9abff2c7ad feat: CRM 客户公海配置 2023-11-08 23:16:55 +08:00
YunaiV
01b62a9b0c Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/sub-table 2023-11-08 22:29:31 +08:00
zhijiantianya@gmail.com
2f6456e2b0 代码生成器:主子表,支持多个从字段 50% 2023-11-08 21:00:34 +08:00
puhui999
f4c92089e5 CRM-客户:添加分页数据场景过滤 2023-11-08 16:42:22 +08:00
puhui999
388e07c834 CRM:完善模块数据放入公海、公海数据领取 2023-11-08 16:05:23 +08:00
puhui999
533b7295ab Merge remote-tracking branch 'yudao/feature/crm' into feature/crm 2023-11-08 14:46:33 +08:00
puhui999
c8ed99a5a4 CRM-客户:完善客户详情、分页、公海数据获取 2023-11-08 14:41:51 +08:00
xiaqing
18de22dc39 增加客户的公海领取和 2023-11-08 10:51:10 +08:00
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
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
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
YunaiV
370d6df473 完善 README.md,补全新的消息队列 2023-11-05 18:28:34 +08:00
YunaiV
023b592299 前端项目,独立仓库 2023-11-05 18:11:34 +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