Commit Graph

112 Commits

Author SHA1 Message Date
苏竹红
35d3a93515 Merge remote-tracking branch 'origin/cc_20230520_partner' into cc_20230520_partner 2023-06-30 09:27:21 +08:00
苏竹红
2e2bcb02d8 222 2023-06-30 09:27:02 +08:00
pserimal
01b0284dc0 升级icepdf从6.1.2到6.2.2 2023-06-29 22:07:49 +08:00
pserimal
846f75ef03 Merge remote-tracking branch 'origin/cc_20230520_partner' into cc_20230520_partner 2023-06-29 15:46:34 +08:00
pserimal
6a68fde497 动态管理功能补充 2023-06-29 15:46:23 +08:00
苏竹红
db8d682598 RESERVATION_8 2023-06-29 14:51:26 +08:00
pserimal
bb6626e66a 服务器无法读取字体文件 2023-06-29 13:20:58 +08:00
俞扬
0d8e9b99dc 腾讯音视频回调 2023-06-29 02:00:14 +08:00
pserimal
72e8eb9c80 获取MDM省市数据Bug修改 2023-06-28 17:22:24 +08:00
pserimal
3ddf9d248a Merge remote-tracking branch 'origin/cc_20230520_partner' into cc_20230520_partner 2023-06-28 16:04:24 +08:00
pserimal
6173174580 获取MDM省市数据 2023-06-28 16:04:17 +08:00
俞扬
42f5e08216 Merge remote-tracking branch 'origin/cc_20230520_partner' into cc_20230520_partner 2023-06-28 15:13:30 +08:00
俞扬
ebdc60de1a 日志相关 2023-06-28 15:13:19 +08:00
苏竹红
6dc00c8f54 userInfo 2023-06-28 15:08:24 +08:00
wxp01309236
1f22e69c01 bugfix 2023-06-28 13:47:06 +08:00
苏竹红
4e6c2d6d39 idCard 2023-06-28 11:12:58 +08:00
苏竹红
d09d317134 添加日志 2023-06-27 21:40:35 +08:00
苏竹红
1a993548ed 添加日志 2023-06-27 20:46:38 +08:00
俞扬
71e0ef0478 重新预约面试BUG修复 2023-06-27 17:25:50 +08:00
苏竹红
2ef41b5722 transferInvestmentManager 2023-06-27 15:16:10 +08:00
zhangchenbiao
0e2df38528 日志处理 2023-06-27 14:17:41 +08:00
wxp01309236
ed03ed189d submitWantShopInfo 2023-06-26 19:16:12 +08:00
苏竹红
a5bc1c87c5 添加面试ID 2023-06-26 11:22:21 +08:00
苏竹红
16fa372047 bug修复 2023-06-25 16:19:15 +08:00
苏竹红
488197f8cf 数据处理 2023-06-25 11:07:38 +08:00
俞扬
10aceade69 面试流程逻辑修改-全流程测试 2023-06-24 22:18:59 +08:00
俞扬
5e3f244a65 房间号生成规则变更 2023-06-21 20:47:26 +08:00
俞扬
dd0226dda8 Merge remote-tracking branch 'origin/cc_20230520_partner' into cc_20230520_partner 2023-06-21 18:19:25 +08:00
俞扬
c429569a48 PC端&小程序端修改面试时间 2023-06-21 18:19:15 +08:00
pserimal
4a3f49d1fc PDF转图片方法细节修改 2023-06-21 17:20: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
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
俞扬
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
wxp01309236
f23c7a2513 意向申请暂存 2023-06-20 17:25:49 +08:00
苏竹红
da96dd629a 面试日程 2023-06-20 16:31:55 +08:00
俞扬
e24ddf5b01 Merge remote-tracking branch 'origin/cc_20230520_partner' into cc_20230520_partner 2023-06-20 15:59:56 +08:00
俞扬
1d3b44b70a 预约申请 2023-06-20 15:58:30 +08:00
苏竹红
80336c5ce0 手机号 2023-06-20 15:43:56 +08:00
俞扬
33e90cf542 预约申请 2023-06-20 14:06:05 +08:00
俞扬
8296e70f26 Merge branch 'cc_20230520_partner' of http://gitlab.coolcollege.cn/hangzhou/java/coolstore-partner-manage into cc_20230520_partner 2023-06-20 11:49:29 +08:00
俞扬
d1f0e4748e 获取忙闲信息修改 2023-06-20 11:47:51 +08:00
zhangchenbiao
7b49fc89a8 Delete coolstore-partner-common.iml 2023-06-19 12:26:09 +00:00
苏竹红
34b72620ef Merge remote-tracking branch 'origin/cc_20230520_partner' into cc_20230520_partner 2023-06-19 20:06:44 +08:00
苏竹红
0bd2f2b96a 分配规则 2023-06-19 19:57:53 +08:00
zhangchenbiao
1f982674a4 Merge remote-tracking branch 'origin/cc_20230520_partner' into cc_20230520_partner 2023-06-19 19:54:53 +08:00
zhangchenbiao
3c8b298706 add interface 2023-06-19 19:54:46 +08:00