Commit Graph

874 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
4d23b83490 authList优化 2023-08-01 14:57:53 +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
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
1884bae01c 添加招商小程序来源保存 2023-07-27 17:59:09 +08:00
xiaodong.hu
2a861d7904 添加招商小程序关于公海私海判断 2023-07-27 16:35:55 +08:00
苏竹红
b81670d969 来源修改 2023-07-27 11:17:51 +08:00
苏竹红
2b943c8755 来源ID修改 2023-07-27 10:19:01 +08:00
xiaodong.hu
15c8b52280 修改ec变更逻辑 2023-07-26 21:04:35 +08:00
xiaodong.hu
8f2a50fbe6 Merge branch 'hxd/feat/interviewSelect' into dev/feat/partner1.1_20230727 2023-07-26 10:09:45 +08:00
xiaodong.hu
12de722de0 更改稽核查询为模糊查询 2023-07-26 10:09:11 +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
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
苏竹红
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
feng.li
893ce5f385 Merge remote-tracking branch 'origin/dev/feat/partner1.1_20230727' into dev/feat/partner1.1_20230727 2023-07-25 16:35:00 +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
苏竹红
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
苏竹红
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
苏竹红
1224c6bf33 跟进次数 2023-07-25 15:00:00 +08:00
苏竹红
6c1fc5236c 跟进次数 2023-07-25 14:34:02 +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
苏竹红
46b80b379f 跟进次数 2023-07-25 13:49:54 +08:00
苏竹红
6569ee1313 跟进次数 2023-07-25 13:44:20 +08:00
苏竹红
afa87f648d Merge remote-tracking branch 'hsayi/dev/feat/partner1.1_20230727' into dev/feat/partner1.1_20230727 2023-07-25 13:35:42 +08:00
苏竹红
ea9199240c 移出黑名单处理 2023-07-25 13:35:33 +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