Commit Graph

309 Commits

Author SHA1 Message Date
俞扬
bef67d3785 app通话回调 2023-08-11 18:24:31 +08:00
俞扬
e5f79048f0 Merge remote-tracking branch 'origin/dev/feat/partner1.3_20230828' into dev/feat/partner1.3_20230828 2023-08-11 15:43:28 +08:00
俞扬
bb043d28d1 app通话 2023-08-11 15:43:16 +08:00
苏竹红
958e4fb441 1.3期 列表+全量私海 2023-08-11 15:08:31 +08:00
俞扬
856260d5da Merge remote-tracking branch 'origin/dev/feat/partner1.3_20230828' into dev/feat/partner1.3_20230828 2023-08-11 11:41:14 +08:00
俞扬
e52c30cff0 websocket 2023-08-11 11:40:56 +08:00
feng.li
fc97ff29ea 标签管理增删改查 2023-08-10 19:14:18 +08:00
feng.li
3c4909b8a5 标签组新增标签组名不可重复 2023-08-10 16:21:33 +08:00
feng.li
f84e9e6e27 标签管理文件同步推送 2023-08-10 16:09:10 +08:00
feng.li
fd896956c5 标签组增删改查 2023-08-10 13:44:00 +08:00
feng.li
fa86db7da7 呼出号码管理增删改查 2023-08-09 18:45:16 +08:00
zhangchenbiao
a64fc9cd89 字段优化 2023-08-01 15:57:00 +08:00
zhangchenbiao
c9c7bd391c 字段优化 2023-08-01 15:16:14 +08:00
zhangchenbiao
ab3ccf47bf 删除无用字段 2023-08-01 15:08:54 +08:00
zhangchenbiao
4d23b83490 authList优化 2023-08-01 14:57:53 +08:00
zhangchenbiao
cd46416a3c 修复角色菜单临时接口 2023-08-01 14:49:05 +08:00
zhangchenbiao
c56757e699 修复角色菜单临时接口 2023-08-01 11:43:32 +08:00
zhangchenbiao
83485c3d73 修复角色菜单临时接口 2023-08-01 10:19:59 +08:00
xiaodong.hu
2d93d67fb1 Merge branch 'dev/feat/partner1.1_20230727' into hxd/fix/SyncCustomer3.0 2023-07-28 13:52:25 +08:00
xiaodong.hu
0669c4ad2d Merge branch 'master' into dev/feat/partner1.1_20230727
# Conflicts:
#	coolstore-partner-dao/src/main/resources/mapper/HyPartnerUserInfoMapper.xml
#	coolstore-partner-model/src/main/java/com/cool/store/entity/HyPartnerLineInfoDO.java
#	coolstore-partner-model/src/main/java/com/cool/store/entity/HyPartnerUserInfoDO.java
2023-07-27 20:02:41 +08:00
xiaodong.hu
2a861d7904 添加招商小程序关于公海私海判断 2023-07-27 16:35:55 +08:00
xiaodong.hu
15c8b52280 修改ec变更逻辑 2023-07-26 21:04:35 +08:00
zhangchenbiao
01a2fb597c 修复角色菜单临时接口 2023-07-25 16:58:02 +08:00
zhangchenbiao
e0a8644f38 新增角色菜单临时接口 2023-07-25 15:56:57 +08:00
xiaodong.hu
8f8bcc4e99 修复查询稽核结果与稽核列表 2023-07-24 17:28:20 +08:00
xiaodong.hu
629d392533 修复面试接口不通的问题 2023-07-21 19:59:58 +08:00
xiaodong.hu
6e7eef3457 Merge branch 'dev/feat/partner1.1_20230727' into hxd/feat/interviewSelect
# Conflicts:
#	coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyInterviewInspectionLogMapper.java
#	coolstore-partner-service/src/main/java/com/cool/store/service/impl/InterviewInspectionServiceImpl.java
2023-07-21 17:12:35 +08:00
xiaodong.hu
dc8f27a365 添加稽核查询功能 2023-07-21 16:53:02 +08:00
俞扬
8440f9d0ae Merge remote-tracking branch 'origin/dev/feat/partner1.1_20230727' into dev/feat/partner1.1_20230727
# Conflicts:
#	coolstore-partner-service/src/main/java/com/cool/store/service/impl/FlowServiceImpl.java
2023-07-20 19:20:20 +08:00
俞扬
4e97ea41e8 短信和飞书通知 2023-07-20 19:18:38 +08:00
feng.li
35dc22f8f1 单词拼写vedio->video 2023-07-20 16:47:10 +08:00
zhangchenbiao
313cbf531b update 2023-07-20 16:20:28 +08:00
feng.li
8d25552041 面试稽核操作相关DO添加构造器注解 2023-07-20 15:47:09 +08:00
feng.li
d33384836f 面试稽核操作相关DO信息修改 2023-07-20 15:37:45 +08:00
xiaodong.hu
1aedfb3442 修复稽核查询swagger不返回data参数 2023-07-20 14:39:57 +08:00
xiaodong.hu
8007ee71a6 Merge branch 'dev/feat/partner1.1_20230727' into hxd/feat/interviewSelect 2023-07-20 11:35:12 +08:00
xiaodong.hu
6953151963 面试稽核查询 2023-07-20 11:34:26 +08:00
feng.li
dce140b170 Merge remote-tracking branch 'origin/dev/feat/partner1.1_20230727' into dev/feat/partner1.1_20230727 2023-07-20 10:56:44 +08:00
feng.li
3134191a62 面试稽核操作修改及MDM审批通过新增面试稽核信息 2023-07-20 10:56:35 +08:00
zhangchenbiao
476bcf0a89 问题修复 2023-07-20 10:31:22 +08:00
zhangchenbiao
6e5aad6f9d Merge remote-tracking branch 'hs/dev/feat/partner1.1_20230727' into dev/feat/partner1.1_20230727 2023-07-20 09:44:10 +08:00
zhangchenbiao
5a74bb43c7 问题修复 2023-07-20 09:43:51 +08:00
feng.li
890dc4c479 面试稽核操作合格不合格及撤销 2023-07-19 18:37:03 +08:00
feng.li
29dfd53d4a Merge remote-tracking branch 'origin/dev/feat/partner1.1_20230727' into dev/feat/partner1.1_20230727 2023-07-19 16:58:09 +08:00
feng.li
f7fb454481 面试稽核操作first-commit 2023-07-19 16:57:26 +08:00
苏竹红
b1e5bb2aef 1.0优化项 字段类型统一 2023-07-19 16:31:44 +08:00
zhangchenbiao
368e4757c3 Merge remote-tracking branch 'hs/dev/feat/partner1.1_20230727' into dev/feat/partner1.1_20230727 2023-07-19 16:04:25 +08:00
zhangchenbiao
fc0aedae7a 稽核区域配置 2023-07-19 16:04:17 +08:00
xiaodong.hu
4eed12c61f ec来源更改保存 2023-07-19 16:00:10 +08:00
苏竹红
438c7f390c 重新分配逻辑 2023-07-19 14:06:38 +08:00