340 Commits

Author SHA1 Message Date
shizhong
d4ad7e9013 🐛 修复 notify 在 IDEA 报错的问题 2024-03-07 12:39:20 +08:00
shizhong
cd14499226 🐛 修复 notice 在 IDEA 报错的问题 2024-03-07 12:37:53 +08:00
shizhong
d4dc61f34f 🐛 修复 operateLog 和 loginLog 在 IDEA 报错的问题 2024-03-07 12:35:03 +08:00
shizhong
73f6f15c54 BUG 2024-03-06 22:44:40 +08:00
shizhong
7319d24cbc 🐛 修复 dictType 和 dictData 在 IDEA 报错的问题 2024-03-06 21:44:22 +08:00
YunaiV
9a49a8ea40 🐛 修复 post 和 dept 在 IDEA 报错的问题
(cherry picked from commit a77173f2ae7b613a3a20b076ecce7473357a46b5)
2024-03-06 21:37:36 +08:00
YunaiV
ef2a70e3f8 crm: 增加基于客户查询回款计划分页
(cherry picked from commit b0c1e55c6ac08a4a5493bbf651beb26f168afab5)
2024-03-06 21:32:52 +08:00
YunaiV
10b057cc3e crm: 增加基于客户查询回款分页
(cherry picked from commit bdc80ea55b676dee414927f7faa6a0ca38471d66)
2024-03-06 21:32:36 +08:00
owen
20382bdb8e eslint
(cherry picked from commit b4ba1043d6d8d65b63df1c4d08188d9bab9a13a9)
2024-03-06 21:32:28 +08:00
YunaiV
99a1587113 crm: 增加基于客户查询商机分页
(cherry picked from commit 88e5e67a89913ce4f20a03cabfdfb202e36ff166)
2024-03-06 21:21:34 +08:00
YunaiV
affd0c52f2 crm:增加合同 List 组件
(cherry picked from commit 31a42fc3f72a11f06b0900541f095e763fbe222b)
2024-03-06 21:21:29 +08:00
YunaiV
993cb4f216 crm:完善数据权限的界面
(cherry picked from commit 5f26c4afe9b4cc0617856d3d04598d896e324a34)
2024-03-06 21:21:11 +08:00
YunaiV
008c125abc crm:联系人增加 ContactList 组件,提供给其它模块内嵌
(cherry picked from commit 7de0e93d5ab304b1026583df5d66522860bd791d)
2024-03-06 21:21:05 +08:00
YunaiV
eb84424f87 crm:code review 联系人详情
(cherry picked from commit 1ba450103eb59eb3dfa7682857e48c6ce6fb5659)
2024-03-06 21:15:53 +08:00
Evol郑天
9f33432926 同步公众号粉丝接口调用错误
Signed-off-by: Evol郑天 <jpevol@163.com>
(cherry picked from commit 633965b07dbbf51cdfc8cb57ce54de2a8f3aa56d)
2024-03-06 21:14:01 +08:00
zyna
2a70d4717b 联系人review修改
(cherry picked from commit 46a8755c936bdaf1e43d339c878ce033a792fe86)
2024-03-06 21:13:55 +08:00
wanwan
3853b763a0 !334 feat: 客户配置 review 修改
* feat: 客户配置 review 修改
* feat: 客户配置 review 修改
* feat: 客户配置 review 修改
* feat: 客户配置 review 修改
* feat: 客户配置 review 修改
* feat: 客户配置 review 修改
* feat: 客户配置 review 修改

(cherry picked from commit 324d1e859ec66415b469cfdcc2da65c9c96af6a1)
2024-03-06 21:13:27 +08:00
owen
687ec00343 营销:适配商城装修组件【营销文章】
(cherry picked from commit d4dc105b4f4341cbfa0357a6c90bf30ff32aad50)
2024-03-06 21:03:53 +08:00
ljlleo
bafc4ca36c 商机、商机状态类型
(cherry picked from commit 2700b08c6978dc2f921b4b4f8088e315dc7e8084)
2024-03-06 21:01:24 +08:00
YunaiV
aee411607f websocket 重新封装
(cherry picked from commit 1744c6ec6fea5897ee202d42c5e6198285ba09e4)
2024-03-06 21:01:13 +08:00
owen
a494d2723b 营销:适配商城装修组件【优惠券】
(cherry picked from commit 253401ace3578ed3118b912b039304e40ee95399)
2024-03-06 20:55:51 +08:00
puhui999
6da65b76d0 crm-数据权限:完善团队成员公共组件
(cherry picked from commit 19a0a83054f73c84a2d5600ef6a1c22e1c68e134)
2024-03-06 20:53:41 +08:00
YunaiV
b78421a31e sms:移除 sendCode、sendMsg 字段
(cherry picked from commit f74ddf46ae518c02ebcb1900ca39e39f97b524af)
2024-03-06 20:52:19 +08:00
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