Commit Graph

373 Commits

Author SHA1 Message Date
苏竹红
62792cc63e 222 2023-06-29 19:43:48 +08:00
苏竹红
21ebf130f6 Merge remote-tracking branch 'origin/cc_20230520_partner' into cc_20230520_partner 2023-06-29 19:29:07 +08:00
苏竹红
2e5cab91d6 公海线索才修改线索状态 2023-06-29 19:28:37 +08:00
zhangchenbiao
b90733b901 Merge remote-tracking branch 'origin/cc_20230520_partner' into cc_20230520_partner 2023-06-29 19:27:28 +08:00
zhangchenbiao
63054bed46 菜单权限控制 2023-06-29 19:27:20 +08:00
pserimal
fe9a38272a Merge remote-tracking branch 'origin/cc_20230520_partner' into cc_20230520_partner 2023-06-29 17:03:50 +08:00
pserimal
8c3989ca90 发起审批获取钉钉用户信息增加校验 2023-06-29 17:03:37 +08:00
zhangchenbiao
7a5497a7f2 Merge remote-tracking branch 'origin/cc_20230520_partner' into cc_20230520_partner 2023-06-29 17:03:34 +08:00
zhangchenbiao
563321d5b8 人员同步问题修复 2023-06-29 17:03:26 +08:00
苏竹红
ab9e8ee2ca Merge remote-tracking branch 'origin/cc_20230520_partner' into cc_20230520_partner 2023-06-29 17:03:01 +08:00
苏竹红
f8c499a279 公海线索才修改线索状态 2023-06-29 17:02:39 +08:00
xiaodong.hu
f73d231d7f Merge branch 'hxd/feat/ecSync' into cc_20230520_partner 2023-06-29 16:38:38 +08:00
xiaodong.hu
6aa4bbd61d 添加ec同步客户来源 2023-06-29 16:37:34 +08:00
俞扬
cf8ac81632 Merge remote-tracking branch 'origin/cc_20230520_partner' into cc_20230520_partner 2023-06-29 16:22:37 +08:00
俞扬
5746d9c435 转让招商经理逻辑修改 2023-06-29 16:22:25 +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
俞扬
23655f249b 显示信息优化 2023-06-29 15:37:51 +08:00
俞扬
760d828144 Merge remote-tracking branch 'origin/cc_20230520_partner' into cc_20230520_partner 2023-06-29 15:25:39 +08:00
俞扬
8d6d0001c4 预约面试时间逻辑修改 2023-06-29 15:25:28 +08:00
苏竹红
00f426392a 是公海线索 才会修改线索状态与招商经理 2023-06-29 15:18:00 +08:00
zhangchenbiao
0157e6b594 Merge remote-tracking branch 'origin/cc_20230520_partner' into cc_20230520_partner 2023-06-29 14:31:54 +08:00
zhangchenbiao
c2b8e4db95 add log 2023-06-29 14:31:03 +08:00
苏竹红
ddc6b4f810 更新意向申请表中信息 2023-06-29 11:47:32 +08:00
zhangchenbiao
f5ac5f4bc8 add log 2023-06-29 11:15:38 +08:00
pserimal
eb239365fb 发起资质审核面试记录缺失及面试状态修改错误 2023-06-29 10:49:59 +08:00
pserimal
037316a8bf Merge remote-tracking branch 'origin/cc_20230520_partner' into cc_20230520_partner 2023-06-29 10:34:13 +08:00
pserimal
444f55429a pom增加打包静态资源配置 2023-06-29 10:32:37 +08:00
zhangchenbiao
09329380b7 Merge remote-tracking branch 'origin/cc_20230520_partner' into cc_20230520_partner 2023-06-29 10:27:42 +08:00
zhangchenbiao
573d60e97e add log 2023-06-29 10:27:33 +08:00
苏竹红
1c9c948895 Merge remote-tracking branch 'origin/cc_20230520_partner' into cc_20230520_partner 2023-06-29 09:48:25 +08:00
苏竹红
92aa28af8d 意向合同号 2023-06-29 09:47:28 +08:00
zhangchenbiao
21ed32a2b4 Merge remote-tracking branch 'origin/cc_20230520_partner' into cc_20230520_partner 2023-06-29 09:41:54 +08:00
zhangchenbiao
5f32431f02 区域接口优化 2023-06-29 09:41:45 +08:00
苏竹红
41363dac50 querySubscribeInterviewTimeList 2023-06-29 09:37:16 +08:00
俞扬
16ee83c037 记录人逻辑修改 2023-06-29 04:14:45 +08:00
俞扬
4b1e4f892f 日志逻辑修改 2023-06-29 04:04:19 +08:00
俞扬
0d8e9b99dc 腾讯音视频回调 2023-06-29 02:00:14 +08:00
苏竹红
aad7bedce3 userInfo 2023-06-28 20:44:41 +08:00
苏竹红
4519286928 userInfo 2023-06-28 19:56:36 +08:00
wxp01309236
88f15cc836 更新缓存 2023-06-28 19:35:49 +08:00
wxp01309236
5734718ff0 getAreaStatus 2023-06-28 19:05:06 +08:00
wxp01309236
a440fcf7d2 submitPartnerIntentInfo 2023-06-28 19:03:39 +08:00
pserimal
fe72a43c27 Merge remote-tracking branch 'origin/cc_20230520_partner' into cc_20230520_partner 2023-06-28 18:40:57 +08:00
pserimal
eff074b5b0 资质审批结束回调接口接收参数修改 2023-06-28 18:40:41 +08:00
俞扬
ebf2e710db 配置信息修改 2023-06-28 18:33:33 +08:00
俞扬
4ea3e1cd7e Merge remote-tracking branch 'origin/cc_20230520_partner' into cc_20230520_partner 2023-06-28 18:20:47 +08:00
俞扬
d16331560d 增加根据线索id查询面试信息接口 2023-06-28 18:20:36 +08:00
xiaodong.hu
22e93955f9 Merge branch 'hxd/feat/ecSync' into cc_20230520_partner
# Conflicts:
#	coolstore-partner-dao/src/main/java/com/cool/store/dao/EnterpriseUserDAO.java
#	coolstore-partner-webb/src/main/java/com/cool/store/config/TokenValidateFilter.java
2023-06-28 18:12:42 +08:00
xiaodong.hu
ed67556619 更改调用时间 2023-06-28 18:01:25 +08:00