Commit Graph

449 Commits

Author SHA1 Message Date
feng.li
fc6b70c31d 预约30分钟之内的面试不发送提示短信 2023-09-22 15:59:36 +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
xiaodong.hu
af363be783 单授权用户未填写线索信息不需要同步到ec中 2023-09-01 17:36:08 +08:00
xiaodong.hu
b8e23ad785 添加ec标签同步代码;优化excel中手机号重名情况; 2023-08-30 15:31:53 +08:00
xiaodong.hu
52620f2048 Merge branch 'master' into hxd/feat/ecSyncLabel 2023-08-29 18:04:59 +08:00
xiaodong.hu
fa2d08915d 添加ec标签同步完整代码 2023-08-28 13:53:50 +08:00
zhangchenbiao
0fd26acfaa 跟进任务排序 2023-08-28 12:50:10 +08:00
zhangchenbiao
66a49ae752 sql 调整 2023-08-28 11:45:41 +08:00
zhangchenbiao
95c74e198e 换绑操作日志处理 2023-08-25 14:26:15 +08:00
苏竹红
054c3f420b 标签换绑 2023-08-25 10:50:43 +08:00
zhangchenbiao
a551efda44 修改招商区域设置分页排序 2023-08-24 19:00:34 +08:00
xiaodong.hu
30535d5a20 Merge remote-tracking branch 'origin/dev/feat/partner1.3_20230828' into dev/feat/partner1.3_20230828 2023-08-24 14:49:49 +08:00
xiaodong.hu
05a7162d33 Merge branch 'hxd/feat/labelAndlLine' into dev/feat/partner1.3_20230828 2023-08-24 14:49:32 +08:00
xiaodong.hu
635f789bf4 添加线索创建记录 2023-08-24 14:48:50 +08:00
zhangchenbiao
4504c58b7e 新增逾期作废状态 2023-08-24 10:30:11 +08:00
zhangchenbiao
a655ddefb0 新增逾期完成 2023-08-23 19:46:12 +08:00
zhangchenbiao
5db08d9752 跟进任务新增线索私海限制 2023-08-23 17:45:28 +08:00
zhangchenbiao
93d38d737a Merge remote-tracking branch 'hs/dev/feat/partner1.3_20230828' into dev/feat/partner1.3_20230828 2023-08-23 17:42:09 +08:00
zhangchenbiao
5ee8b907f0 换绑更新跟进任务id 2023-08-23 17:42:02 +08:00
feng.li
578c1fce54 呼出手机号 标签 标签组编辑时未修改内容也允许更新fix 2023-08-23 13:56:37 +08:00
feng.li
ff8ab1db75 Merge remote-tracking branch 'origin/dev/feat/partner1.3_20230828' into dev/feat/partner1.3_20230828 2023-08-23 13:35:48 +08:00
feng.li
c3fe671fe4 呼出手机号 标签 标签组编辑时未修改内容也允许更新 2023-08-23 13:35:39 +08:00
zhangchenbiao
47627a1945 定时任务逻辑调整 2023-08-22 15:03:01 +08:00
zhangchenbiao
8946e73112 跟进任务列表排序 2023-08-22 14:13:17 +08:00
xiaodong.hu
5e85d06793 Merge branch 'hxd/feat/labelAndlLine' into dev/feat/partner1.3_20230828 2023-08-21 22:34:00 +08:00
xiaodong.hu
b78a025730 Merge branch 'master' into hxd/feat/labelAndlLine 2023-08-21 22:33:30 +08:00
苏竹红
5ce06c3cf5 线索来源 搜索 2023-08-21 16:18:10 +08:00
zhangchenbiao
a22baae4d9 Merge remote-tracking branch 'hs/dev/feat/partner1.3_20230828' into dev/feat/partner1.3_20230828 2023-08-21 14:42:18 +08:00
zhangchenbiao
6362d50366 通知图片更改&跟进任务状态跟新sql调整 2023-08-21 14:33:44 +08:00
苏竹红
1dd0744b03 来源统一处理 2023-08-21 12:12:34 +08:00
zhangchenbiao
78629e49a1 Merge remote-tracking branch 'hs/dev/feat/partner1.3_20230828' into dev/feat/partner1.3_20230828 2023-08-18 17:19:29 +08:00