Commit Graph

165 Commits

Author SHA1 Message Date
苏竹红
16fa372047 bug修复 2023-06-25 16:19:15 +08:00
pserimal
4345fb05aa Merge remote-tracking branch 'origin/cc_20230520_partner' into cc_20230520_partner 2023-06-25 15:05:53 +08:00
俞扬
531d3eda26 Merge remote-tracking branch 'origin/cc_20230520_partner' into cc_20230520_partner 2023-06-25 14:38:38 +08:00
俞扬
ce1415bcfe 自动更新房间状态 2023-06-25 14:38:27 +08:00
pserimal
db1b5ee481 Merge remote-tracking branch 'origin/cc_20230520_partner' into cc_20230520_partner 2023-06-25 14:22:12 +08:00
pserimal
1ead623010 进入面试间方法将修改面试实际开始时间设置为第一个人进入的时间 2023-06-25 14:22:00 +08:00
zhangchenbiao
5c1a4cee5b Merge remote-tracking branch 'origin/cc_20230520_partner' into cc_20230520_partner 2023-06-25 13:56:27 +08:00
zhangchenbiao
aa4834ef1f fix 2023-06-25 13:56:19 +08:00
苏竹红
bdabaae0a7 Merge remote-tracking branch 'origin/cc_20230520_partner' into cc_20230520_partner 2023-06-25 13:50:55 +08:00
苏竹红
005a36b929 重点城市只返回市 2023-06-25 13:49:21 +08:00
pserimal
e824b86e88 修复员工后端查询面试列表room_status筛选失败bug 2023-06-25 13:43:43 +08:00
pserimal
8183e67285 Merge remote-tracking branch 'origin/cc_20230520_partner' into cc_20230520_partner 2023-06-25 11:14:04 +08:00
pserimal
bd6e86a218 面试表增加deleted字段代码遗漏修改及面试实际开始时间时间修改错误 2023-06-25 11:13:51 +08:00
苏竹红
488197f8cf 数据处理 2023-06-25 11:07:38 +08:00
俞扬
10aceade69 面试流程逻辑修改-全流程测试 2023-06-24 22:18:59 +08:00
pserimal
04c7e626b2 Merge remote-tracking branch 'origin/cc_20230520_partner' into cc_20230520_partner 2023-06-21 20:26:49 +08:00
pserimal
dc220e12a6 面试录制视频上传回调接口 2023-06-21 20:26:39 +08:00
wxp01309236
b25bf8f614 意向书联调 2023-06-21 19:52:46 +08:00
苏竹红
ef69f20f36 11 2023-06-21 19:33:17 +08:00
zhangchenbiao
a1b8e72c29 Merge remote-tracking branch 'origin/cc_20230520_partner' into cc_20230520_partner 2023-06-21 17:42:18 +08:00
zhangchenbiao
7f3546f9d4 sql update 2023-06-21 17:42:08 +08:00
苏竹红
5f0aa220cd 根据线索信息查询面试信息 2023-06-21 17:39:11 +08:00
苏竹红
1c7c02aa66 Merge remote-tracking branch 'origin/cc_20230520_partner' into cc_20230520_partner 2023-06-21 17:20:08 +08:00
zhangchenbiao
81cefc2862 sql update 2023-06-21 17:19:50 +08:00
苏竹红
2bf264a535 线索私海 2023-06-21 17:19:42 +08:00
wxp01309236
3eafa757c5 换绑 2023-06-21 16:44:42 +08:00
苏竹红
eff7dce872 意向区域 2023-06-21 16:23:56 +08:00
苏竹红
074c3a3565 Merge remote-tracking branch 'origin/cc_20230520_partner' into cc_20230520_partner 2023-06-21 16:16:03 +08:00
苏竹红
7e45d2b910 意向区域 2023-06-21 16:15:45 +08:00
俞扬
f4197135a8 Merge remote-tracking branch 'origin/cc_20230520_partner' into cc_20230520_partner
# Conflicts:
#	coolstore-partner-service/src/main/java/com/cool/store/service/impl/InterviewServiceImpl.java
2023-06-21 16:12:04 +08:00
俞扬
d79be7c53a 面试预约申请&同意预约 2023-06-21 16:09:59 +08:00
苏竹红
2f1774c2ea Merge remote-tracking branch 'origin/cc_20230520_partner' into cc_20230520_partner
# Conflicts:
#	coolstore-partner-dao/src/main/java/com/cool/store/dao/HyPartnerBaseInfoDAO.java
#	coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyPartnerBaseInfoMapper.java
#	coolstore-partner-dao/src/main/resources/mapper/HyPartnerBaseInfoMapper.xml
2023-06-21 15:58:53 +08:00
苏竹红
72a3bcc850 高德 2023-06-21 15:56:14 +08:00
wxp01309236
fa410088f7 联调 2023-06-21 15:27:34 +08:00
zhangchenbiao
8d46abeab0 Merge remote-tracking branch 'origin/cc_20230520_partner' into cc_20230520_partner
# Conflicts:
#	coolstore-partner-dao/src/main/resources/mapper/HyPartnerUserInfoMapper.xml
#	coolstore-partner-model/src/main/java/com/cool/store/vo/PartnerLineInfoVO.java
#	coolstore-partner-service/src/main/java/com/cool/store/service/impl/HyPartnerLineInfoServiceImpl.java
2023-06-21 15:16:38 +08:00
zhangchenbiao
0750d68809 update 2023-06-21 15:14:13 +08:00
苏竹红
a8ebe4a72c 分配 2023-06-21 12:54:02 +08:00
zhangchenbiao
d0f6102b15 Merge remote-tracking branch 'origin/cc_20230520_partner' into cc_20230520_partner 2023-06-21 10:57:13 +08:00
zhangchenbiao
349695b0c5 列表字段更改 2023-06-21 10:57:05 +08:00
俞扬
b9c9bc2bae Merge remote-tracking branch 'origin/cc_20230520_partner' into cc_20230520_partner
# Conflicts:
#	coolstore-partner-service/src/main/java/com/cool/store/service/impl/InterviewServiceImpl.java
2023-06-21 10:25:03 +08:00
俞扬
57af6a656b 同意面试预约 2023-06-21 10:21:58 +08:00
zhangchenbiao
60315342d5 增加删除状态 2023-06-21 09:53:29 +08:00
苏竹红
81bc51ba70 公海列表状态 2023-06-20 23:12:41 +08:00
苏竹红
4a2b2d9463 Merge remote-tracking branch 'origin/cc_20230520_partner' into cc_20230520_partner 2023-06-20 22:17:08 +08:00
苏竹红
cc935459c7 closeOrPassFollow 2023-06-20 22:16:54 +08:00
zhangchenbiao
ebeafd812c Merge remote-tracking branch 'origin/cc_20230520_partner' into cc_20230520_partner 2023-06-20 22:15:24 +08:00
zhangchenbiao
246108f5c5 nullpointer 2023-06-20 22:15:05 +08:00
苏竹红
0d84ceea78 私海线索 2023-06-20 21:29:22 +08:00
苏竹红
e738d4e2e7 私海线索 2023-06-20 21:05:07 +08:00
苏竹红
33b9e24357 私海线索 2023-06-20 20:35:19 +08:00