Commit Graph

475 Commits

Author SHA1 Message Date
feng.li
b600d80d10 Merge branch 'master' into dev/feat/partner1.5.2_20231121 2023-11-08 14:28:16 +08:00
feng.li
027e972482 获取各预约时间段预约情况 2023-11-07 22:41:00 +08:00
xiaodong.hu
cdf2aba59a 添加ec创建时间落库 2023-11-07 21:09:02 +08:00
苏竹红
603ab7247a 飞书推送事件 优化 2023-11-01 13:42:07 +08:00
xiaodong.hu
01c2ce6b07 添加ec操作日志以及飞书通知,以及修复离职查询 2023-10-31 14:15:35 +08:00
xiaodong.hu
5498832bd4 更改手机号校验code码,重构ec同步代码 2023-10-27 13:55:38 +08:00
xiaodong.hu
d9a7606579 Merge branch 'hxd/feat/partner1.5' into dev/feat/partner1.5_20231106
# Conflicts:
#	coolstore-partner-service/src/main/java/com/cool/store/service/FollowTaskService.java
#	coolstore-partner-service/src/main/java/com/cool/store/service/impl/FollowTaskServiceImpl.java
#	coolstore-partner-webb/src/main/java/com/cool/store/controller/FollowTaskController.java
2023-10-26 19:04:09 +08:00
xiaodong.hu
107bfe9d35 提交ec同步历史线索功能 2023-10-26 18:59:38 +08:00
陈伏伽
d6d71b76f6 线索搜索sql修正 2023-10-26 11:09:40 +08:00
feng.li
4c73375592 EnterpriseUserMapper问题修改 2023-10-25 15:04:21 +08:00
feng.li
fe3d706fbb enterprise_user相关mapper增加feishu_user_id并添加根据user_id批量获取feishu_user_id 2023-10-25 11:39:24 +08:00
苏竹红
23214127f1 招商经理 2023-10-23 13:55:44 +08:00
陈伏伽
d310587c0e 标签组列表排序 2023-10-20 17:38:00 +08:00
苏竹红
8f47bdfc55 在线状态 2023-10-20 10:41:22 +08:00
陈伏伽
ad46e015ea sql修复2 2023-10-19 18:52:58 +08:00
陈伏伽
e6c1e1989f 查询sql修复 2023-10-19 18:36:32 +08:00
陈伏伽
758d9bfa8c 查询sql修复 2023-10-19 17:58:38 +08:00
陈伏伽
07d22ae3d0 查询sql修复 2023-10-19 17:49:06 +08:00
陈伏伽
ac68c59ab4 意向区域id修改成路径 2023-10-19 17:33:26 +08:00
陈伏伽
82b63d6db0 用户和全量私海列表sql更改 2023-10-19 16:15:13 +08:00
陈伏伽
98c01656d9 用户私海查询调整 2023-10-19 15:37:34 +08:00
苏竹红
3fae8f02d2 日程SQL 修改 2023-10-08 13:53:57 +08:00
feng.li
baf5b77f8e 面试前30分钟提醒Bug fix 2023-10-08 10:14:49 +08:00
feng.li
9efd962694 预约30分钟之内的面试不发送提示短信Bug fix 2023-10-07 11:44:30 +08:00
xiaodong.hu
2e23c295f2 更改800请求来源直接调用;修复800回调失败 2023-09-25 18:14:11 +08:00
feng.li
8f3d16df4f Merge remote-tracking branch 'origin/dev/feat/partner1.4_20231009' into dev/feat/partner1.4_20231009 2023-09-22 16:06:26 +08:00
feng.li
fc6b70c31d 预约30分钟之内的面试不发送提示短信 2023-09-22 15:59:36 +08:00
zhangchenbiao
c723af1381 Merge remote-tracking branch 'hs/dev/feat/partner1.4_20231009' into dev/feat/partner1.4_20231009 2023-09-22 14:40:59 +08:00
zhangchenbiao
25471df161 删除不用字段 2023-09-22 14:40:11 +08:00
苏竹红
11ff0ab0ae update_time 2023-09-22 14:31:39 +08:00
feng.li
bd78c693c8 面试开始前一天及30分钟前提醒 2023-09-22 14:23:28 +08:00
苏竹红
c982dbf46c create_time 2023-09-19 14:54:31 +08:00
苏竹红
9d57777d88 邮箱地址 2023-09-19 11:28:50 +08:00
俞扬
95bfeab0bc Merge branch 'master' into dev/feat/partner1.4_20231009
# Conflicts:
#	coolstore-partner-dao/src/main/java/com/cool/store/dao/HyPartnerIntentInfoDAO.java
#	coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyPartnerIntentInfoMapper.java
#	coolstore-partner-dao/src/main/resources/mapper/HyPartnerIntentInfoMapper.xml
#	coolstore-partner-model/src/main/java/com/cool/store/entity/HyPartnerIntentInfoDO.java
#	coolstore-partner-service/src/main/java/com/cool/store/service/impl/FlowServiceImpl.java
#	coolstore-partner-service/src/main/java/com/cool/store/service/impl/HyPartnerIntentInfoServiceImpl.java
2023-09-19 10:34:52 +08:00
苏竹红
a0f5235863 bug 修改 2023-09-18 11:43:30 +08:00
zhangchenbiao
665ffc974b 新增恶心的时间搜索 2023-09-15 16:39:56 +08:00
苏竹红
403534f808 类型改为Integer 2023-09-15 16:34:56 +08:00
苏竹红
c62c2a5192 是否有认识的人 逻辑添加 2023-09-15 12:23:22 +08:00
苏竹红
0d0c08ead2 Ec 意向区域回显 2023-09-14 19:22:39 +08:00
xiaodong.hu
54d36658cd Merge branch 'dev/feat/partner1.4_20231009' into hxd/feat/partner1.4
# Conflicts:
#	coolstore-partner-service/src/main/java/com/cool/store/service/impl/EcSyncServiceImpl.java
2023-09-14 10:50:58 +08:00
xiaodong.hu
7a628950ed 1.修改面试通知函通过节点
2.添加ec意向区域同步
3.定时同步800请求来源
2023-09-14 10:41:39 +08:00
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
俞扬
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
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
苏竹红
560d179463 预约面试 通知修改 2023-09-07 09:45:16 +08:00