Commit Graph

1081 Commits

Author SHA1 Message Date
zhangchenbiao
2c44793c85 Merge remote-tracking branch 'hs/dev/feat/partner1.4_20231009' into dev/feat/partner1.4_20231009
# Conflicts:
#	coolstore-partner-common/src/main/java/com/cool/store/enums/ErrorCodeEnum.java
2023-09-13 20:19:56 +08:00
zhangchenbiao
b4d15f5d6a 新增美颜&线索基本信息修改相关接口 2023-09-13 20:18:42 +08:00
feng.li
49f9769995 多次转让不再修改日程 2023-09-13 16:41:29 +08:00
苏竹红
60ed31a313 同一个微信号校验 2023-09-13 14:11:45 +08:00
俞扬
1800db3303 Merge branch 'master' into dev/feat/partner1.4_20231009
# Conflicts:
#	coolstore-partner-common/src/main/java/com/cool/store/enums/ErrorCodeEnum.java
2023-09-12 13:12:31 +08:00
苏竹红
00598ca308 BaseInfo 新增字段 2023-09-11 14:50:41 +08:00
苏竹红
9c13abb092 意向区域新增不限&新增字段&手机号校验 2023-09-11 14:44:06 +08:00
xiaodong.hu
f983fce978 修复线索批量导入手机号验重错误 2023-09-08 18:13:25 +08:00
xiaodong.hu
65929c8882 Merge branch 'master' into dev/feat/partner1.3_20230904
# Conflicts:
#	coolstore-partner-dao/src/main/resources/mapper/HyPartnerUserInfoMapper.xml
#	coolstore-partner-service/src/main/java/com/cool/store/service/impl/EcSyncServiceImpl.java
2023-09-08 14:11:36 +08:00
zhangchenbiao
69d965407e Merge remote-tracking branch 'hs/dev/feat/partner1.3_20230904' into dev/feat/partner1.3_20230904 2023-09-08 11:04:39 +08:00
zhangchenbiao
6841c7a532 同步数据处理 2023-09-08 11:04:30 +08:00
zhangchenbiao
331da47300 删除corpId 2023-09-08 10:45:33 +08:00
俞扬
2e49dc1465 Merge remote-tracking branch 'origin/dev/feat/partner1.3_20230904' into dev/feat/partner1.3_20230904 2023-09-07 20:47:38 +08:00
俞扬
8bf54d26a5 结束跟进修改删除日程逻辑 2023-09-07 20:47:27 +08:00
xiaodong.hu
780ff3799e Merge branch 'hxd/feat/ecSyncLabel' into dev/feat/partner1.3_20230904 2023-09-07 15:04:15 +08:00
xiaodong.hu
252c2858e6 添加ec标签双边逗号 2023-09-07 15:03:29 +08:00
苏竹红
b7c0e0b923 预约面试 通知修改 2023-09-07 09:52:21 +08:00
苏竹红
9ad61241b3 Merge remote-tracking branch 'hsayi/dev/feat/partner1.3_20230904' into dev/feat/partner1.3_20230904 2023-09-07 09:45:31 +08:00
苏竹红
560d179463 预约面试 通知修改 2023-09-07 09:45:16 +08:00
俞扬
8ea4214cb9 Merge remote-tracking branch 'origin/dev/feat/partner1.3_20230904' into dev/feat/partner1.3_20230904 2023-09-06 17:47:41 +08:00
俞扬
2786d8adb8 面试预约时间增加报错信息 2023-09-06 17:47:27 +08:00
苏竹红
c3e5e16014 日志修改 2023-09-06 15:31:13 +08:00
苏竹红
ab3ee255f1 bug 修复 2023-09-06 14:35:29 +08:00
苏竹红
11c1433543 日志打印添加 2023-09-06 09:42:37 +08:00
苏竹红
daa19bd83f Merge remote-tracking branch 'hsayi/dev/feat/partner1.3_20230904' into dev/feat/partner1.3_20230904 2023-09-06 09:40:23 +08:00
苏竹红
d2079aab77 飞书转让通知 2023-09-06 09:40:11 +08:00
俞扬
7bd7474858 Merge remote-tracking branch 'origin/dev/feat/partner1.3_20230904' into dev/feat/partner1.3_20230904 2023-09-05 20:36:46 +08:00
俞扬
2fbeb8864a 通话回调接口调整 2023-09-05 20:36:32 +08:00
苏竹红
c85d6c9479 添加校验 2023-09-04 15:33:41 +08:00
苏竹红
0272a71a5d operateUser 2023-09-04 15:29:19 +08:00
苏竹红
9fee83af41 分配招商经理优化分配人 2023-09-04 15:13:31 +08:00
苏竹红
ad770fd27b -分配招商经理优化 2023-09-04 15:04:38 +08:00
苏竹红
079edca294 分配招商经理优化 2023-09-04 14:59:27 +08:00
苏竹红
518baa23ae Merge remote-tracking branch 'hsayi/dev/feat/partner1.3_20230904' into dev/feat/partner1.3_20230904 2023-09-01 17:50:50 +08:00
苏竹红
f914edf191 日志优化 2023-09-01 17:50:37 +08:00
xiaodong.hu
af363be783 单授权用户未填写线索信息不需要同步到ec中 2023-09-01 17:36:08 +08:00
feng.li
18ca1476a7 同意面试预约超时提前5分钟Bug-Fix 2023-09-01 14:58:53 +08:00
feng.li
7d1a12c467 Merge remote-tracking branch 'origin/dev/feat/partner1.3_20230904' into dev/feat/partner1.3_20230904 2023-08-31 17:23:58 +08:00
feng.li
271832d9ad 同意面试预约超时提前5分钟 2023-08-31 17:23:44 +08:00
俞扬
66ed41d678 预约时间调整-过滤中午时间 2023-08-31 10:56:27 +08:00
苏竹红
dab470155d 转让招商经理 优化 2023-08-30 19:23:28 +08:00
feng.li
c82f61f1da Merge remote-tracking branch 'origin/dev/feat/partner1.3_20230904' into dev/feat/partner1.3_20230904 2023-08-30 16:02:04 +08:00
feng.li
510a311b6d 增加面试预约待审核时转让招商经理的飞书预约申请消息 2023-08-30 16:01:38 +08:00
xiaodong.hu
c82c984847 Merge branch 'hxd/feat/ecSyncLabel' into dev/feat/partner1.3_20230904 2023-08-30 15:33:12 +08:00
xiaodong.hu
b8e23ad785 添加ec标签同步代码;优化excel中手机号重名情况; 2023-08-30 15:31:53 +08:00
feng.li
c6049e8c56 超过预约时间同意预约直接面试已开始 2023-08-30 11:32:59 +08:00
xiaodong.hu
52620f2048 Merge branch 'master' into hxd/feat/ecSyncLabel 2023-08-29 18:04:59 +08:00
俞扬
1fac8e9935 预约时间调整 2023-08-29 16:58:04 +08:00
俞扬
ee172131ed Merge branch 'master' into dev/feat/partner1.3_20230904
# Conflicts:
#	coolstore-partner-service/src/main/java/com/cool/store/service/impl/HyPartnerLineInfoServiceImpl.java
2023-08-29 14:52:02 +08:00
xiaodong.hu
b51910f565 Merge branch 'hxd/feat/labelAndlLine' into hxd/feat/ecSyncLabel 2023-08-28 15:22:42 +08:00