Commit Graph

4463 Commits

Author SHA1 Message Date
苏竹红
c3804eae03 Merge remote-tracking branch 'origin/cc_20230520_partner' into cc_20230520_partner 2023-06-21 17:24:13 +08:00
苏竹红
402d18bf20 线索私海 2023-06-21 17:23:44 +08:00
pserimal
58ace47150 Merge remote-tracking branch 'origin/cc_20230520_partner' into cc_20230520_partner 2023-06-21 17:23:14 +08:00
pserimal
89c4546e9f 发起审核增加更新开发主管 2023-06-21 17:22:49 +08:00
pserimal
afbca96734 接口全部使用使用POST请求加请求体的方式 2023-06-21 17:22:06 +08:00
pserimal
4a3f49d1fc PDF转图片方法细节修改 2023-06-21 17:20:45 +08:00
pserimal
126cb29f18 小程序端验签response编码问题 2023-06-21 17:20:19 +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
zhangchenbiao
bccf42e20f Merge remote-tracking branch 'origin/cc_20230520_partner' into cc_20230520_partner 2023-06-21 17:04:37 +08:00
zhangchenbiao
9d4db0e4d8 身份证随机 2023-06-21 17:04:26 +08:00
wxp01309236
3eafa757c5 换绑 2023-06-21 16:44:42 +08:00
苏竹红
a3893c4cd3 黑名单列表 2023-06-21 16:39:31 +08:00
苏竹红
3dea9b51e6 黑名单列表 2023-06-21 16:38:02 +08:00
苏竹红
3fd490f143 意向区域112 2023-06-21 16:28:06 +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
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