Commit Graph

1450 Commits

Author SHA1 Message Date
苏竹红
f8a6b47e40 移动端 非必填 2024-01-04 11:14:50 +08:00
feng.li
a52eca559f Merge branch 'master' into dev/feat/partner1.6_20231226 2024-01-02 19:03:01 +08:00
feng.li
450a307f9b Merge branch 'dev/fix/partner1.5.3_20240103' into pre
# Conflicts:
#	coolstore-partner-common/src/main/java/com/cool/store/utils/StringUtil.java
2024-01-02 16:44:13 +08:00
feng.li
f430a79d63 使用日期格式枚举类 2024-01-02 16:42:33 +08:00
feng.li
f29bef2bf7 Merge remote-tracking branch 'origin/master' into dev/feat/partner1.6_20231226 2024-01-02 16:37:31 +08:00
feng.li
a3070b0551 Merge branch 'dev/feat/partner1.6_20231226' into pre 2024-01-02 16:24:40 +08:00
feng.li
76d051898c 生成房间号日期格式错误 2024-01-02 16:17:26 +08:00
xiaodong.hu
2256812c3c 添加非空判断 2024-01-02 16:17:26 +08:00
feng.li
fcaa71a274 生成房间号日期格式错误 2024-01-02 16:15:59 +08:00
feng.li
408b132980 线索提交申请后会销参加状态设置错误 2023-12-29 17:24:18 +08:00
feng.li
2e2dd6b065 线索提交申请后会销参加状态设置错误 2023-12-29 17:22:34 +08:00
feng.li
8170ac24b3 Merge branch 'dev/feat/partner1.6_20231226' into pre 2023-12-29 16:43:31 +08:00
feng.li
159aa1d02e 发起资质审批后刷新线索参加会销状态 2023-12-29 16:40:19 +08:00
feng.li
943a320976 Merge branch 'dev/feat/partner1.6_20231226' into pre 2023-12-29 15:14:05 +08:00
feng.li
ebba9db657 会销线索列表中的会销id错误 2023-12-29 15:13:35 +08:00
feng.li
b770919414 Merge branch 'dev/feat/partner1.6_20231226' into pre 2023-12-29 14:47:17 +08:00
feng.li
5cfd27760b 会销结束面试 2023-12-29 14:46:34 +08:00
feng.li
b2258e7845 Merge branch 'dev/feat/partner1.6_20231226' into pre 2023-12-29 13:58:52 +08:00
feng.li
9b04b1a370 提交意向申请后刷新线索会销状态 2023-12-29 13:58:22 +08:00
feng.li
1cdff3cd99 会销开始面试bug 2023-12-29 13:24:53 +08:00
feng.li
6cbc3ffe76 提醒自动结束会销短信发送bug 2023-12-29 11:49:25 +08:00
feng.li
7d828f44f4 Merge branch 'dev/feat/partner1.6_20231226' into pre 2023-12-28 13:34:30 +08:00
feng.li
12810baa00 线索报名会销跳转地址 2023-12-28 13:34:03 +08:00
苏竹红
f8d4c2b355 Merge remote-tracking branch 'hsayi/dev/feat/partner1.6_20231226' into dev/feat/partner1.6_20231226 2023-12-28 11:36:50 +08:00
苏竹红
1e6e6e5320 消息通知 userId使用飞书userId 2023-12-28 11:36:40 +08:00
feng.li
696f58f93a 飞书通知跳转路径错误修改 2023-12-28 11:20:31 +08:00
feng.li
68e87cc2f7 Merge branch 'dev/feat/partner1.6_20231226' into pre 2023-12-27 18:22:36 +08:00
feng.li
c415b8b2d2 Merge remote-tracking branch 'origin/dev/feat/partner1.6_20231226' into dev/feat/partner1.6_20231226 2023-12-27 18:21:20 +08:00
feng.li
3702e7000b 获取14天的是否有面试情况及获取近7日和当天面试数量 2023-12-27 18:21:00 +08:00
苏竹红
8934b8344a Merge branch 'dev/feat/partner1.6_20231226' into pre 2023-12-27 17:10:13 +08:00
苏竹红
d3841f3044 Merge remote-tracking branch 'hsayi/dev/feat/partner1.6_20231226' into dev/feat/partner1.6_20231226 2023-12-27 17:06:08 +08:00
苏竹红
2b9a1c2943 添加线索状态 2023-12-27 17:05:58 +08:00
feng.li
2581a2cb6a Merge branch 'dev/feat/partner1.6_20231226' into pre 2023-12-27 14:30:04 +08:00
feng.li
ac81c9111b Merge remote-tracking branch 'origin/dev/feat/partner1.6_20231226' into dev/feat/partner1.6_20231226 2023-12-27 14:28:33 +08:00
feng.li
9f6194912f 面试信息返回线索参加的会销负责人信息 2023-12-27 14:27:28 +08:00
苏竹红
1f3a2e26e9 Merge branch 'dev/feat/partner1.6_20231226' into pre 2023-12-27 14:03:04 +08:00
苏竹红
53f04491b4 类型 2023-12-27 14:02:37 +08:00
feng.li
4b4e2f94dc 私海列表返回会销面试中的线索 2023-12-27 13:51:21 +08:00
苏竹红
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
苏竹红
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