367 Commits

Author SHA1 Message Date
liuhongfeng
2988989b1a 【新增】ureport2 集成
(cherry picked from commit 4440ec866c6ef5f9f68f9b6c4248ab3d2c6f3bb9)
2024-03-06 20:49:58 +08:00
YunaiV
7f50592069 crm:code review 权限列表
(cherry picked from commit b1f5ad55b8f894560ea27c7ffdbe84a45fb35b5c)
2024-03-06 20:49:39 +08:00
YunaiV
646f73b923 代码生成:增加主子表 erp 模式的示例
(cherry picked from commit a42d0695fec0e2831c5b3b09593c93059ce67703)
2024-03-06 20:44:51 +08:00
YunaiV
262ef0f651 代码生成:增加主子表 inner 模式的示例
(cherry picked from commit 6c405ba42039fd849a387e53df0799419d7a6000)
2024-03-06 20:44:23 +08:00
YunaiV
8d2d1a26b5 代码生成:增加主子表 normal 模式的示例
(cherry picked from commit 9aca49c1ffb1344f5416d793e6c9edc56179ffab)
2024-03-06 20:43:58 +08:00
YunaiV
59e98a6679 代码生成:增加 tree 树形的示例
(cherry picked from commit bbc37613b6c1aa236752926d09c997b046f117e8)
2024-03-06 20:43:52 +08:00
YunaiV
4cf6b9000a 代码生成:增加 crud 单表示例
(cherry picked from commit 40b1522ed0da116f361a17f9ba5d6ee5df021b16)
2024-03-06 20:43:40 +08:00
puhui999
76c05964fa crm-团队成员:新增获得权限级别名称函数 getLevelName
(cherry picked from commit 8e0cf5c1e54afd114a41fd40f838614a68bbb4d0)
2024-03-06 20:36:44 +08:00
puhui999
8e08665344 crm-团队成员:完善团队成员通用组件封装
(cherry picked from commit 015a1640c1a1c66d6975788158eaeaa4c4200130)
2024-03-06 20:36:29 +08:00
YunaiV
3524e3525b 代码生成:支持设置主子表的信息
(cherry picked from commit 45656562a82353927da0aa614a1ce0689e7bd6b0)
2024-03-06 20:36:07 +08:00
puhui999
fa1d2f25e7 crm-团队成员: 先提交一波
(cherry picked from commit 27c9a0f32deee6e69b81348aae08ba114a5a0797)
2024-03-06 20:33:39 +08:00
YunaiV
8823f11109 代码生成:增加主子表(内嵌)的示例
(cherry picked from commit 999d8de9e972d62ae4bf2a23bcb05d7559c8c101)
2024-03-06 20:33:21 +08:00
YunaiV
05592577ff 代码生成:增加主子表(普通)的示例
(cherry picked from commit f0f78860255d1b3190556cd4dbd500c69d8a4b1f)
2024-03-06 20:33:18 +08:00
YunaiV
26e6d287f5 代码生成:增加 one 情况下的示例代码
(cherry picked from commit 72c5eaae31fd37dcfcd016224351237a9e2004d7)
2024-03-06 20:33:14 +08:00
zyna
1f22d9ad0b crm联系人init
(cherry picked from commit ed26142bb0d928af1727de1bf1bf6a5fd4a7c140)
2024-03-06 20:32:54 +08:00
Wanwan
f356bf8076 feat: CRM 客户限制
(cherry picked from commit 6369b334e311f5cc402685d230df8d453d4c5007)
2024-03-06 20:32:43 +08:00
YunaiV
c8a3c5a3ad 主子表:暂时存储,准备重构
(cherry picked from commit 4e413a10e621a34235a6f520f8b97cd77cc00c95)
2024-03-06 20:31:57 +08:00
Wanwan
c3dc0836c2 feat: CRM 客户公海配置
(cherry picked from commit 288aa72cdd3ebd889118d02f8e66ca606ddc4d09)
2024-03-06 20:30:20 +08:00
niou233
4d02972b86 refactor: 会员商品收藏
(cherry picked from commit f2c71d5836895b7d4ff6520388709f5426d88559)
2024-03-06 20:30:03 +08:00
YunaiV
adba0142f1 多租户:登录界面,根据 host 域名获取对应的租户编号
(cherry picked from commit 85ee558bef3937554deb7ab208b4c160590f6d2d)
2024-03-05 17:57:53 +08:00
VicoHu
79cf4d31e8 fix: 修复关闭拼团活动请求URL错误的问题
Signed-off-by: VicoHu <vicohu@163.com>
(cherry picked from commit 3f803767c43afca73a8e456282129a0aea4e8285)
2024-03-05 17:51:58 +08:00
YunaiV
e354a6f22e code review:产品分类
(cherry picked from commit 47bb88d8924543f00900f594b8eabfb37813fb0d)
2024-03-05 17:51:53 +08:00
ZanGe丶
618cf7459a 【crm:产品及产品分类】
(cherry picked from commit ff6f05df84c223f6df7676f1ffd2a5da09813c18)
2024-03-05 17:49:15 +08:00
YunaiV
98fc2fe327 优化:社交登录、用户的管理
(cherry picked from commit a9b91e743645b8510dd585ac7772794f32638548)
2024-03-05 17:44:12 +08:00
Wanwan
f780cf0c7b feat: 客户详情 + review 修改
(cherry picked from commit 23f483ac452c6f140b399351918caaffb54c7129)
2024-03-05 17:42:31 +08:00
jason
6949c196d0 转账 - 新增转账订单查询
(cherry picked from commit 753f5de81e6d49cba07f99532f4e8dd4511e432e)
2024-03-05 17:41:57 +08:00
dongshanshan
525e511670 feat: 会员商品收藏
(cherry picked from commit 9a3253ad20fd384c3692941ea2fb44323bf6db00)
2024-03-05 17:41:11 +08:00
owen
97a94cd29f 营销:完善商城装修
1. 拆分页面设计用的属性修改接口
2. 增加模板的页面保存
3. 增加唯一名称校验
4. 增加页面编辑器,默认选中组件判断

(cherry picked from commit 881c4f3a2932ff4892bf09e6de9f790d5f93d9c6)
2024-03-05 17:41:01 +08:00
liuhongfeng
bccd02a53f 【新增】负责人
【修改】规范命名:期数:indexNo-》period

(cherry picked from commit 2b84de7e0927371a2c5271886bc1612a07fc6497)
2024-03-05 17:33:13 +08:00
jason
18cd9dde6e 转账 - 管理后台新增转账示例
(cherry picked from commit 55a961e86265a1c2b37874dfd076b60935de6964)
2024-03-05 17:32:29 +08:00
owen
d12dcde81d 商城装修
(cherry picked from commit e9ff8d323752dd0df8bebbb71b8c3fe4f6e8caff)
2024-03-05 17:31:22 +08:00
Wanwan
7923078e17 feat: 调整客户表的字段
(cherry picked from commit 59cf0c29f09e8a21987cce4c1adc7bc42ec5a19c)
2024-03-05 17:30:11 +08:00
Wanwan
ed9ae42ba8 feat: 调整客户表的字段
(cherry picked from commit 4cdab6fb3efe97c26023fba411c0b8af1b67b64d)
2024-03-05 17:30:07 +08:00
puhui999
0cddb9c370 三方应用新增授权方的网页应用 agentId 属性
(cherry picked from commit a624db04e93455b1af5d0b316771361b77f5960b)
2024-03-05 17:29:45 +08:00
puhui999
ca7c311f88 新增社交用户 RUD
(cherry picked from commit 6ee2492ff167bd0036c19c9d502a1d10b4069388)
2024-03-05 17:25:31 +08:00
puhui999
212d40f290 新增社交客户端 CRUD
(cherry picked from commit 8935188a820c70c843780df0321008d83c407ee5)
2024-03-05 17:24:58 +08:00
Wanwan
c0a10146d6 feat: 客户表的 crud
(cherry picked from commit 044754cdb4cd78543ce9550d8b45923dd82ef8bf)
2024-03-05 17:23:20 +08:00
puhui999
8c5cdd0ea5 商品 spu 脱离优惠卷模块
(cherry picked from commit 75135e1e4f8bc44aa9cadb81f1acce3093cf931b)
2024-03-05 17:22:16 +08:00
puhui999
1298c3dd52 完善 banner 管理
(cherry picked from commit a7439ee08b59d47ef1162e0b1db93e94d2f3cb45)
2024-03-05 17:22:09 +08:00
kehaiyou
6bffc7991f fix: 【工作流】--加签减签review修改接口地址
(cherry picked from commit 5cfb67d0472ccf3bcaecc0d9a4d6cadc6116e3b5)
2024-03-05 17:21:22 +08:00
jason
16aba063d1 钱包 - 优化
支付应用 - 证书模式增加应用私钥

(cherry picked from commit bb5945958bfa27c9d1668c71b8397ada1bcefb23)
2024-03-05 17:21:11 +08:00
puhui999
4fcdd63e51 新增 banner 管理
(cherry picked from commit 491b3a5018db069f0237473441b1189273ee0f0d)
2024-03-05 17:21:03 +08:00
liuhongfeng
47f948f26b 【新增】回款计划 功能
(cherry picked from commit 26780c3525405b9e9109854edea2cee6f75c3d93)
2024-03-05 17:20:37 +08:00
liuhongfeng
7b020781f0 【新增】回款管理 功能
(cherry picked from commit 7ad1457f799cf7af8252316dc6cda36165062a53)
2024-03-05 17:20:32 +08:00
zhangshuai
9f04b8e34b 限时折扣
(cherry picked from commit 9f77514c17cc5a45726db905d1c415948cce1a6e)
2024-03-05 17:20:00 +08:00
puhui999
ccec7ad410 SPU: 完善优惠卷选择
(cherry picked from commit 01d78429cc68139d87138c66db93f85aec94dc14)
2024-03-05 17:15:16 +08:00
puhui999
de53601fcb SPU: 完善优惠卷选择
(cherry picked from commit 18df708b49ca43690622ecb12aead6d3b59e1b1d)
2024-03-05 17:14:29 +08:00
puhui999
e9da54b100 SPU: 新增优惠卷选择
(cherry picked from commit 3464bb9c74a0f3de9efc6ee5a4c42bac81c67485)
2024-03-05 17:12:24 +08:00
913752709@qq.com
a5f21a9b9f feat: CRM 线索表 crud
(cherry picked from commit 7af2a3bcc31dcfdc65db4fec968008b3a834bd2e)
2024-03-05 17:11:33 +08:00
puhui999
bb18f469de 订单列表:自定义列抽离封装为组件
(cherry picked from commit 04d88ce1a61cacbf613f7d77565334bc15abfd12)
2024-03-05 17:11:17 +08:00