Commit Graph

1461 Commits

Author SHA1 Message Date
苏竹红
71e46e571e hyPartnerBaseInfoDAO 2023-12-26 20:31:30 +08:00
苏竹红
458263c383 Merge branch 'dev/feat/partner1.6_20231226' into pre 2023-12-26 16:08:54 +08:00
陈伏伽
557365b0d5 partner_id 2023-12-26 16:07:51 +08:00
苏竹红
5fbd3856b8 Merge branch 'dev/feat/partner1.6_20231226' into pre 2023-12-26 15:29:08 +08:00
陈伏伽
62068d9d75 Merge remote-tracking branch 'hsay/dev/feat/partner1.6_20231226' into dev/feat/partner1.6_20231226 2023-12-26 15:28:33 +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
feng.li
4c783589da Merge remote-tracking branch 'origin/dev/feat/partner1.6_20231226' into dev/feat/partner1.6_20231226 2023-12-26 15:05:07 +08:00
feng.li
ccd67bce1d webbc sonar fix 2023-12-26 15:04:54 +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
陈伏伽
a57a22b77a Merge remote-tracking branch 'hsay/dev/feat/partner1.6_20231226' into dev/feat/partner1.6_20231226 2023-12-26 14:28:18 +08:00
陈伏伽
20b1dde6dd 会销通知修改 2023-12-26 14:27:54 +08:00
feng.li
45523b4da2 Merge branch 'dev/feat/partner1.6_20231226' into pre 2023-12-26 14:25:14 +08:00
feng.li
79bda6e7e6 sonar bad smell fix 3 2023-12-26 14:24:52 +08:00
feng.li
83ad2a871e Merge branch 'dev/feat/partner1.6_20231226' into pre 2023-12-26 14:21:49 +08:00
feng.li
28248d036b sonar bad smell fix 2 2023-12-26 14:21:23 +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
6c5df4177a Merge branch 'dev/feat/partner1.6_20231226' into pre 2023-12-26 13:45:21 +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
feng.li
75738d2c0e Merge remote-tracking branch 'origin/dev/feat/partner1.6_20231226' into dev/feat/partner1.6_20231226 2023-12-26 13:21:14 +08:00
feng.li
bb67faa3ca fix sonar bad smell 2023-12-26 13:21:02 +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
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