360 Commits

Author SHA1 Message Date
YunaiV
6fe6e51b2f 📖 操作日志的界面实现
(cherry picked from commit 1eefa02c4c54749e0f93d563349c35d913f6a5f5)
2024-03-08 21:03:11 +08:00
puhui999
2b1c12eb4b crm-客户:集成操作日志详情组件
(cherry picked from commit 261d8b2aa4775b8453dc2368eb1ecb78e8ee4cbf)
2024-03-08 20:53:54 +08:00
落日晚风
62b9002cf6 满减送数据对接
(cherry picked from commit 21e8dbf985ece78b84a0172af419bbfcd60a4f71)
2024-03-08 20:53:30 +08:00
zyna
d6a4795ca4 crm联系人商机修改
(cherry picked from commit a1fd3afc3226889617b48591dde42927bd9f502b)
2024-03-08 20:52:47 +08:00
owen
cae1d7cb1a 统计:增加商品统计
(cherry picked from commit ca35e1a4afa82b5a4be63d1c0c2e71f9743d7cab)
2024-03-08 20:52:15 +08:00
水人
96fae4f3ea update src/api/bpm/task/index.ts.
后台接口地址是return-list,前台写成了get-return-list

Signed-off-by: 水人 <417693680@qq.com>
(cherry picked from commit 346863a8a9808284c7c0c0001398e0e44a2c9b59)
2024-03-08 20:51:45 +08:00
puhui999
5ab56e3fff crm-客户:集成操作日志详情组件
(cherry picked from commit 455688eaa88ba8f3754a26cd6d28217758f81eeb)
2024-03-08 20:50:56 +08:00
puhui999
f9c272ad0d feat:新增公共操作日志详情组件
(cherry picked from commit 59c66707753f81d369d952caee9ebc65d29bc472)
2024-03-08 20:50:45 +08:00
YunaiV
70a8fb7d66 📈 CRM:code review 联系人商机功能
(cherry picked from commit ce79dd68a3a6a7e1db4d8062a8f56ba425e65c17)
2024-03-07 13:04:08 +08:00
YunaiV
2be6f196e6 🔨 CRM:优化产品代码的实现
(cherry picked from commit b3d66cd0aac1c013ed1692323a6fe2c220e31d2a)
2024-03-07 13:03:54 +08:00
shizhong
72b82625b9 🐛 修复 CodegenColumnVO 的 autoIncrement 类型不正确 2024-03-07 13:03:42 +08:00
ZanGe丶
776fed6a5d 【crm:优化产品及产品分类】
(cherry picked from commit dde61c29a01de1a12cb8a8a684fe088b01e77f72)
2024-03-07 13:02:07 +08:00
zyna
7c9cf67fb0 联系人商机功能
(cherry picked from commit ba49b2851cd5d31fd13066e25a5b6be5526ec05b)
2024-03-07 13:02:00 +08:00
shizhong
021edf5662 🐛 修复 job 在 IDEA 报错的问题 2024-03-07 12:57:05 +08:00
liuhongfeng
91bf155409 【修改】ureport2 集成
(cherry picked from commit 0b9cf35b17e17eb2aa283bd1f8ebfd059497e96d)
2024-03-07 12:56:23 +08:00
shizhong
963a902eb0 🐛 修复 file 在 IDEA 报错的问题 2024-03-07 12:56:03 +08:00
shizhong
f372fc0cdc 🐛 修复 user 在 IDEA 报错的问题 2024-03-07 12:51:49 +08:00
shizhong
4721455926 🐛 修复 tenant 在 IDEA 报错的问题 2024-03-07 12:49:11 +08:00
shizhong
94a9876204 🐛 修复 sms 在 IDEA 报错的问题 2024-03-07 12:47:29 +08:00
shizhong
2f5d1d0083 🐛 修复 sensitiveWord 在 IDEA 报错的问题 2024-03-07 12:40:54 +08:00
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