Commit Graph

4596 Commits

Author SHA1 Message Date
苏竹红
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
pserimal
bd1998e536 Merge remote-tracking branch 'origin/cc_20230520_partner' into cc_20230520_partner 2023-06-21 15:33:13 +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
pserimal
9e5ad14f30 POST请求使用Body发送参数 2023-06-21 15:13:50 +08:00
苏竹红
bbf3d47de5 意向铺位 2023-06-21 14:00:40 +08:00
苏竹红
a8ebe4a72c 分配 2023-06-21 12:54:02 +08:00
zhangchenbiao
b92e34224c update 2023-06-21 11:33:20 +08:00
zhangchenbiao
3f9edd6dae update 2023-06-21 11:00: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
zhangchenbiao
448fac5aa2 Merge remote-tracking branch 'origin/cc_20230520_partner' into cc_20230520_partner 2023-06-21 09:46:36 +08:00
zhangchenbiao
83554de312 token 2023-06-21 09:46:29 +08:00
苏竹红
81bc51ba70 公海列表状态 2023-06-20 23:12:41 +08:00
苏竹红
dcdb29c085 移出黑名单 2023-06-20 23:02:59 +08:00
苏竹红
443709a69a 移出黑名单 2023-06-20 22:51:25 +08:00
苏竹红
c7f08b6381 enterpriseUserDOS 2023-06-20 22:41:05 +08:00
苏竹红
a80ab18ab8 Merge remote-tracking branch 'origin/cc_20230520_partner' into cc_20230520_partner 2023-06-20 22:27:53 +08:00
苏竹红
b43c20e439 closeOrPassFollow 2023-06-20 22:27:40 +08:00
wxp01309236
47f951accb @JsonFormat 2023-06-20 22:22:53 +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
wxp01309236
a95912347f delCoolDownFirstLoginFlag 2023-06-20 22:12:04 +08:00
苏竹红
c39891a98b closeOrPassFollow 2023-06-20 21:55:50 +08:00
wxp01309236
95dac72873 意向书 2023-06-20 21:31:44 +08:00
wxp01309236
44c7e6196b Merge branch 'cc_20230520_partner' of http://gitlab.coolcollege.cn/hangzhou/java/coolstore-partner-manage into cc_20230520_partner 2023-06-20 21:31:01 +08:00
wxp01309236
6639f881e5 意向书修改 2023-06-20 21:30:52 +08:00
苏竹红
0d84ceea78 私海线索 2023-06-20 21:29:22 +08:00
苏竹红
4c3ca1193a Merge remote-tracking branch 'origin/cc_20230520_partner' into cc_20230520_partner 2023-06-20 21:05:20 +08:00
苏竹红
e738d4e2e7 私海线索 2023-06-20 21:05:07 +08:00
wxp01309236
2784a6b6b8 意向申请 2023-06-20 20:41:48 +08:00
苏竹红
33b9e24357 私海线索 2023-06-20 20:35:19 +08:00
苏竹红
f4302c7907 私海线索 2023-06-20 20:34:40 +08:00
苏竹红
cb832d1301 线索信息与基本信息 2023-06-20 19:49:20 +08:00
苏竹红
450802098b 线索信息与基本信息 2023-06-20 19:44:52 +08:00
苏竹红
c11990517c 线索信息与基本信息 2023-06-20 19:24:24 +08:00
pserimal
c3cca6f27a 查询面试详情增加开发主管 2023-06-20 19:14:34 +08:00
pserimal
a12202fe24 静态资源转移(字体及通过函背景图) 2023-06-20 19:13:06 +08:00
pserimal
24551e6a03 OSSServer上传文件路径修改 2023-06-20 19:12:28 +08:00