Commit Graph

358 Commits

Author SHA1 Message Date
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
cd46416a3c 修复角色菜单临时接口 2023-08-01 14:49:05 +08:00
zhangchenbiao
d3a8e2d40e 修复角色菜单临时接口 2023-08-01 13:59:11 +08:00
zhangchenbiao
c56757e699 修复角色菜单临时接口 2023-08-01 11:43:32 +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
xiaodong.hu
12de722de0 更改稽核查询为模糊查询 2023-07-26 10:09:11 +08:00
zhangchenbiao
f70fff7c3b Merge remote-tracking branch 'hs/dev/feat/partner1.1_20230727' into dev/feat/partner1.1_20230727 2023-07-25 16:58:10 +08:00
zhangchenbiao
01a2fb597c 修复角色菜单临时接口 2023-07-25 16:58:02 +08:00
zhangchenbiao
0a83bd3a3d 新增角色菜单临时接口 2023-07-25 16:34:48 +08:00
苏竹红
1c258a8d2c 跟进次数 2023-07-25 16:34:48 +08:00
苏竹红
dd575d8638 跟进次数 2023-07-25 16:34:48 +08:00
苏竹红
857c0fe4cc 跟进次数 2023-07-25 16:34:48 +08:00
苏竹红
650d69a97b 跟进次数 2023-07-25 16:34:48 +08:00
feng.li
cebad69c3a 结束跟进时删除稽核信息(如果有) 2023-07-25 16:34:47 +08:00
zhangchenbiao
fe6b6f1ebb Merge remote-tracking branch 'hs/dev/feat/partner1.1_20230727' into dev/feat/partner1.1_20230727 2023-07-25 15:57:04 +08:00
zhangchenbiao
e0a8644f38 新增角色菜单临时接口 2023-07-25 15:56:57 +08:00
苏竹红
1224c6bf33 跟进次数 2023-07-25 15:00:00 +08:00
苏竹红
6c1fc5236c 跟进次数 2023-07-25 14:34:02 +08:00
苏竹红
46b80b379f 跟进次数 2023-07-25 13:49:54 +08:00
苏竹红
6569ee1313 跟进次数 2023-07-25 13:44:20 +08:00
苏竹红
ea9199240c 移出黑名单处理 2023-07-25 13:35:33 +08:00
xiaodong.hu
8f8bcc4e99 修复查询稽核结果与稽核列表 2023-07-24 17:28:20 +08:00
xiaodong.hu
629d392533 修复面试接口不通的问题 2023-07-21 19:59:58 +08:00
苏竹红
95d13c8806 userChannelId 2023-07-21 17:38:47 +08:00
xiaodong.hu
fb4071d698 更改日志类 2023-07-21 17:15:15 +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
feng.li
35dc22f8f1 单词拼写vedio->video 2023-07-20 16:47:10 +08:00
zhangchenbiao
e03e59f51c Merge remote-tracking branch 'hs/dev/feat/partner1.1_20230727' into dev/feat/partner1.1_20230727 2023-07-20 16:16:55 +08:00
zhangchenbiao
2c77668631 过滤非叶子节点 2023-07-20 16:16:47 +08:00
feng.li
d33384836f 面试稽核操作相关DO信息修改 2023-07-20 15:37:45 +08:00
zhangchenbiao
1bf5889662 update 2023-07-20 15:14:26 +08:00
zhangchenbiao
0013d70903 Merge remote-tracking branch 'hs/dev/feat/partner1.1_20230727' into dev/feat/partner1.1_20230727 2023-07-20 14:42:56 +08:00
zhangchenbiao
75d4a9634e update 2023-07-20 14:42:49 +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