Commit Graph

1433 Commits

Author SHA1 Message Date
feng.li
8dc9fad270 展会相关短信模板code修改 2023-12-25 15:11:35 +08:00
feng.li
4ffd4a8961 Merge branch 'dev/feat/partner1.6_20231226' into pre 2023-12-25 13:10:56 +08:00
feng.li
ab5c822e24 Merge remote-tracking branch 'origin/dev/feat/partner1.6_20231226' into dev/feat/partner1.6_20231226 2023-12-25 11:54:16 +08:00
feng.li
9beb5d39e8 消息卡片跳转指定页问题修复 2023-12-25 11:54:04 +08:00
苏竹红
dcb719cceb Merge branch 'dev/feat/partner1.6_20231226' into pre 2023-12-25 10:20:28 +08:00
苏竹红
390a9987c3 报名会销 2023-12-25 10:20:05 +08:00
苏竹红
be496bd57a Merge remote-tracking branch 'hsayi/dev/feat/partner1.6_20231226' into dev/feat/partner1.6_20231226 2023-12-25 10:18:35 +08:00
苏竹红
275317afd5 exhibitionCode 2023-12-25 10:18:27 +08:00
feng.li
e97de23d9c 消息卡片跳转链接添加定义路径及路径参数 2023-12-22 17:03:43 +08:00
feng.li
b32efa8277 Merge remote-tracking branch 'origin/dev/feat/partner1.6_20231226' into dev/feat/partner1.6_20231226 2023-12-22 11:32:28 +08:00
feng.li
bb6c152e5f 返回通用信息方法对修改时间操作的单独处理 2023-12-22 11:32:02 +08:00
苏竹红
f32a988ef1 Merge branch 'dev/feat/partner1.6_20231226' into pre 2023-12-21 16:26:14 +08:00
苏竹红
d8a2e6532d sql 报错 2023-12-21 16:25:53 +08:00
苏竹红
560a2c5e39 Merge branch 'dev/feat/partner1.6_20231226' into pre 2023-12-21 10:29:08 +08:00
苏竹红
148af56746 意向区域 类型变换 2023-12-21 10:28:37 +08:00
苏竹红
a2c1d5734a Merge branch 'dev/feat/partner1.6_20231226' into pre 2023-12-20 18:29:54 +08:00
苏竹红
8fd08a0ac4 会销来源ID变更 2023-12-20 18:28:51 +08:00
苏竹红
d2fcb90f8e Merge branch 'dev/feat/partner1.6_20231226' into pre 2023-12-20 14:07:05 +08:00
苏竹红
80a9f5bfc5 我的会销添加日期 2023-12-20 14:06:36 +08:00
苏竹红
7b89eca0b5 Merge branch 'dev/feat/partner1.6_20231226' into pre 2023-12-20 13:50:07 +08:00
苏竹红
497bf63c3d 1 2023-12-20 13:49:43 +08:00
苏竹红
d3c2ae885a Merge branch 'dev/feat/partner1.6_20231226' into pre 2023-12-20 13:46:13 +08:00
苏竹红
118678c7ef 配置 2023-12-20 13:43:59 +08:00
苏竹红
3f62edd248 配置 2023-12-20 13:43:37 +08:00
苏竹红
64d8f1920f 配置 2023-12-20 13:42:41 +08:00
苏竹红
e109a752ba startDate 格式修改 2023-12-20 13:38:25 +08:00
xiaodong.hu
5109be349c 添加非空判断 2023-12-19 19:48:24 +08:00
苏竹红
d8dfbeda5a Merge branch 'dev/feat/partner1.6_20231226' into pre 2023-12-19 19:29:18 +08:00
苏竹红
8e0e41672d 参数新增 2023-12-19 19:28:54 +08:00
苏竹红
62e4bb5d07 Merge branch 'dev/feat/partner1.6_20231226' into pre 2023-12-19 19:03:17 +08:00
苏竹红
70b7c5fd3b 入参字段不对应 2023-12-19 16:59:54 +08:00
苏竹红
eb8e6eb84a Merge branch 'dev/feat/partner1.6_20231226' into pre 2023-12-19 16:37:10 +08:00
苏竹红
8676855e6d Merge remote-tracking branch 'hsayi/dev/feat/partner1.6_20231226' into dev/feat/partner1.6_20231226 2023-12-19 16:36:25 +08:00
苏竹红
8050c8bc67 exhibitionCode 去掉 2023-12-19 16:36:00 +08:00
feng.li
77aaffadfb Merge remote-tracking branch 'origin/dev/feat/partner1.6_20231226' into dev/feat/partner1.6_20231226 2023-12-19 16:15:11 +08:00
feng.li
72b33abad8 给被自动关闭会销关联线索发通知 2023-12-19 16:15:00 +08:00
苏竹红
62dd1580d0 Merge branch 'dev/feat/partner1.6_20231226' into pre 2023-12-19 14:39:53 +08:00
xiaodong.hu
fe42d45ec6 Merge branch 'dev/fix/partner1.5.3_20231219' into pre 2023-12-19 14:37:48 +08:00
苏竹红
4a115ba80f Merge remote-tracking branch 'hsayi/dev/feat/partner1.6_20231226' into dev/feat/partner1.6_20231226 2023-12-19 14:37:29 +08:00
苏竹红
75b7a7074b 入参时间修改 2023-12-19 14:37:21 +08:00
xiaodong.hu
2c97710eaa 更改分页排序3 2023-12-19 14:37:16 +08:00
feng.li
fd403c1f88 自动关闭会销任务 2023-12-19 14:31:02 +08:00
xiaodong.hu
cc7f05aa2c Merge branch 'dev/fix/partner1.5.3_20231219' into pre 2023-12-19 14:03:14 +08:00
xiaodong.hu
61538825c5 更改分页排序2 2023-12-19 14:02:37 +08:00
xiaodong.hu
3651c034c0 Merge branch 'dev/fix/partner1.5.3_20231219' into pre 2023-12-19 13:12:19 +08:00
xiaodong.hu
ea1e246b23 更改分页排序 2023-12-19 13:11:39 +08:00
feng.li
e7d5194b4c Merge branch 'dev/feat/partner1.6_20231226' into pre 2023-12-18 17:52:59 +08:00
feng.li
fae3b4408e 获取线索报名的会销列表及详情 2023-12-18 17:45:54 +08:00
feng.li
ee013f8c13 Merge remote-tracking branch 'origin/dev/feat/partner1.6_20231226' into dev/feat/partner1.6_20231226 2023-12-18 16:31:17 +08:00
feng.li
c3d7d9586d 返回通用信息方法完善 2023-12-18 16:29:09 +08:00