Commit Graph

897 Commits

Author SHA1 Message Date
苏竹红
600eb9e724 Merge branch 'dev/feat/partner1.6_20231226' into pre 2023-12-26 20:33:39 +08:00
苏竹红
71e46e571e hyPartnerBaseInfoDAO 2023-12-26 20:31:30 +08:00
苏竹红
5fbd3856b8 Merge branch 'dev/feat/partner1.6_20231226' into pre 2023-12-26 15:29:08 +08:00
陈伏伽
af661f550a 结束会销时间 2023-12-26 15:28:19 +08:00
feng.li
76e62fa9dd Merge branch 'dev/feat/partner1.6_20231226' into pre 2023-12-26 15:05:27 +08:00
陈伏伽
2d747e263d 消息通知日期处理 2023-12-26 14:42:04 +08:00
苏竹红
15dd925b25 Merge branch 'dev/feat/partner1.6_20231226' into pre 2023-12-26 14:30:22 +08:00
陈伏伽
20b1dde6dd 会销通知修改 2023-12-26 14:27:54 +08:00
feng.li
83ad2a871e Merge branch 'dev/feat/partner1.6_20231226' into pre 2023-12-26 14:21:49 +08:00
陈伏伽
9aefa27cea Merge remote-tracking branch 'hsay/dev/feat/partner1.6_20231226' into dev/feat/partner1.6_20231226 2023-12-26 14:03:16 +08:00
陈伏伽
0a91b787ac 代码处理 2023-12-26 14:02:59 +08:00
feng.li
e8f3e59aef 添加会销协作人飞书通知错误 2023-12-26 13:44:58 +08:00
feng.li
2ef9ae274c 添加会销协作人飞书通知错误 2023-12-26 13:39:11 +08:00
feng.li
9f1aded10f Merge branch 'dev/feat/partner1.6_20231226' into pre 2023-12-26 13:23:00 +08:00
陈伏伽
ef9746018c 没有对应线索 2023-12-26 12:20:45 +08:00
苏竹红
a34c9063df getPartnerInfo 添加字段 2023-12-26 12:11:54 +08:00
feng.li
483b60bf95 自动关闭会销方法错误修改 2023-12-26 11:14:19 +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
苏竹红
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
苏竹红
d3c2ae885a Merge branch 'dev/feat/partner1.6_20231226' into pre 2023-12-20 13:46:13 +08:00
苏竹红
e109a752ba startDate 格式修改 2023-12-20 13:38:25 +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
苏竹红
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
feng.li
fd403c1f88 自动关闭会销任务 2023-12-19 14:31:02 +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
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
苏竹红
ea26167907 私海列表参数过多 优化入参为对象 2023-12-18 16:05:01 +08:00
feng.li
e4d340382f 800新增字段对接 2023-12-18 15:10:55 +08:00
feng.li
a74f480916 通用信息更改方案 2023-12-14 19:22:46 +08:00