Commit Graph

550 Commits

Author SHA1 Message Date
feng.li
fa86db7da7 呼出号码管理增删改查 2023-08-09 18:45:16 +08:00
zhangchenbiao
b86eaa7c52 菜单权限过滤逻辑调整,取消仅按权限过滤 2023-08-02 10:28:42 +08:00
zhangchenbiao
ab3ccf47bf 删除无用字段 2023-08-01 15:08:54 +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
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
1884bae01c 添加招商小程序来源保存 2023-07-27 17:59:09 +08:00
苏竹红
b81670d969 来源修改 2023-07-27 11:17:51 +08:00
xiaodong.hu
8f2a50fbe6 Merge branch 'hxd/feat/interviewSelect' into dev/feat/partner1.1_20230727 2023-07-26 10:09:45 +08:00
feng.li
94414fc675 修改面试通过时间为本系统接收回调时间 2023-07-25 18:51:20 +08:00
feng.li
4d8c04b14b Merge remote-tracking branch 'origin/dev/feat/partner1.1_20230727' into dev/feat/partner1.1_20230727 2023-07-25 17:44:26 +08:00
feng.li
58d443797f 800审批通过时间在面试信息页和稽核信息页不同 2023-07-25 17:38:38 +08:00
苏竹红
f51d844ba1 冷静期结 2023-07-25 17:38:06 +08:00
xiaodong.hu
a62ec0dc2d Merge branch 'dev/feat/partner1.1_20230727' into hxd/feat/interviewSelect 2023-07-25 17:04:43 +08:00
苏竹红
f5c615563f Merge remote-tracking branch 'hsayi/dev/feat/partner1.1_20230727' into dev/feat/partner1.1_20230727 2023-07-25 16:54:32 +08:00
苏竹红
ffab746b52 38318 2023-07-25 16:53:29 +08:00
zhangchenbiao
0a83bd3a3d 新增角色菜单临时接口 2023-07-25 16:34:48 +08:00
苏竹红
a2bcaacb47 移出黑名单 不需要到私海 2023-07-25 16:34:48 +08:00
苏竹红
35bf2fc89d assignFollowUser 2023-07-25 16:34:48 +08:00
feng.li
cebad69c3a 结束跟进时删除稽核信息(如果有) 2023-07-25 16:34:47 +08:00
苏竹红
eaad584df5 Merge remote-tracking branch 'hsayi/dev/feat/partner1.1_20230727' into dev/feat/partner1.1_20230727 2023-07-25 16:12:32 +08:00
苏竹红
3f6386e3f0 移出黑名单 不需要到私海 2023-07-25 16:12:22 +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
苏竹红
a6f32fcd82 assignFollowUser 2023-07-25 15:44:15 +08:00
xiaodong.hu
a85a5edc0a Merge branch 'dev/feat/partner1.1_20230727' into hxd/feat/interviewSelect 2023-07-25 13:56:05 +08:00
xiaodong.hu
94984cd5d3 添加稽核脚本执行日志 2023-07-25 13:54:40 +08:00
俞扬
f3e95c6032 修改配置 2023-07-25 11:54:23 +08:00
feng.li
6158ae4feb Merge remote-tracking branch 'origin/dev/feat/partner1.1_20230727' into dev/feat/partner1.1_20230727 2023-07-25 10:49:12 +08:00
feng.li
97cfac0c5a 不再生成通过函图片 2023-07-25 10:49:03 +08:00
苏竹红
1586ea97e3 Merge remote-tracking branch 'hsayi/dev/feat/partner1.1_20230727' into dev/feat/partner1.1_20230727 2023-07-25 10:22:53 +08:00
苏竹红
26047a95bd 移出黑名单处理 2023-07-25 10:21:50 +08:00
俞扬
d6a5630697 转让面试官逻辑修改 2023-07-24 19:17:11 +08:00
俞扬
7130521882 Merge branch 'dev/feat/partner1.1_20230727' of http://git.hsayi.com:19062/HSAY/hsay-partner into dev/feat/partner1.1_20230727 2023-07-24 18:00:29 +08:00
俞扬
bffe6e46b5 意向申请逻辑修改 2023-07-24 18:00:12 +08:00
xiaodong.hu
0c43c0131b Merge branch 'hxd/feat/interviewSelect' into dev/feat/partner1.1_20230727 2023-07-24 17:28:59 +08:00
xiaodong.hu
8f8bcc4e99 修复查询稽核结果与稽核列表 2023-07-24 17:28:20 +08:00
苏竹红
7487ce218b sendFeiShuNotice 2023-07-24 15:57:59 +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
zhangchenbiao
cd607517da Merge remote-tracking branch 'hs/dev/feat/partner1.1_20230727' into dev/feat/partner1.1_20230727 2023-07-21 16:56:51 +08:00
zhangchenbiao
c3a20390f2 update 2023-07-21 16:54:44 +08:00
xiaodong.hu
dc8f27a365 添加稽核查询功能 2023-07-21 16:53:02 +08:00
feng.li
5b2b60cf32 800审批通过指定面试稽核信息type 2023-07-21 16:41:19 +08:00
feng.li
a19a5af081 Merge remote-tracking branch 'origin/dev/feat/partner1.1_20230727' into dev/feat/partner1.1_20230727 2023-07-21 13:56:46 +08:00
feng.li
40142c99dc 800审批通过指定面试稽核信息create_time 2023-07-21 13:56:26 +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
苏竹红
f6006afcb1 Merge remote-tracking branch 'hsayi/dev/feat/partner1.1_20230727' into dev/feat/partner1.1_20230727 2023-07-20 16:51:34 +08:00