Commit Graph

804 Commits

Author SHA1 Message Date
俞扬
4310b7577c 发送邀请短信 2023-10-23 13:49:18 +08:00
zhangchenbiao
f003392307 Merge remote-tracking branch 'hs/dev/feat/partner1.4_20231009' into dev/feat/partner1.4_20231009 2023-10-09 15:49:05 +08:00
zhangchenbiao
9277413d89 access_token 缓存时间变更 2023-10-09 15:48:55 +08:00
苏竹红
a4c4525173 此号码已绑定其他微信 2023-10-09 14:00:57 +08:00
feng.li
bd78c693c8 面试开始前一天及30分钟前提醒 2023-09-22 14:23:28 +08:00
俞扬
cb15d0e045 点单小程序跳转 2023-09-19 16:46:51 +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
俞扬
cef8be0f29 Merge remote-tracking branch 'origin/dev/feat/partner1.4_20231009' into dev/feat/partner1.4_20231009
# Conflicts:
#	coolstore-partner-service/src/main/java/com/cool/store/service/impl/FlowServiceImpl.java
2023-09-14 17:22:02 +08:00
俞扬
da782f7e48 加盟商短信逻辑修改 2023-09-14 17:19:56 +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
苏竹红
60ed31a313 同一个微信号校验 2023-09-13 14:11:45 +08:00
feng.li
8cf947a02f 从MDM接口获取所属大区和业务区域 2023-09-12 14:16:05 +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
苏竹红
9c13abb092 意向区域新增不限&新增字段&手机号校验 2023-09-11 14:44:06 +08:00
苏竹红
b7c0e0b923 预约面试 通知修改 2023-09-07 09:52:21 +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
苏竹红
ab3ee255f1 bug 修复 2023-09-06 14:35:29 +08:00
苏竹红
d2079aab77 飞书转让通知 2023-09-06 09:40:11 +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
苏竹红
dab470155d 转让招商经理 优化 2023-08-30 19:23:28 +08:00
xiaodong.hu
b8e23ad785 添加ec标签同步代码;优化excel中手机号重名情况; 2023-08-30 15:31:53 +08:00
俞扬
3e93ad3fb3 电话呼出连接逻辑修改,增加多手机号兼容 2023-08-26 13:44:17 +08:00
xiaodong.hu
caf7ad70db Merge branch 'hxd/feat/labelAndlLine' into dev/feat/partner1.3_20230828 2023-08-25 15:51:28 +08:00
xiaodong.hu
9385fc88a3 更改枚举 message 2023-08-25 15:50:24 +08:00
zhangchenbiao
65a69c8c6c Merge remote-tracking branch 'hs/dev/feat/partner1.3_20230828' into dev/feat/partner1.3_20230828 2023-08-25 15:30:03 +08:00
zhangchenbiao
c63ed57b99 通知图片替换 2023-08-25 15:29:56 +08:00
xiaodong.hu
efcaf70f79 Merge branch 'hxd/feat/labelAndlLine' into dev/feat/partner1.3_20230828 2023-08-25 15:25:16 +08:00
xiaodong.hu
e7ca529fef 更改导入五百超出错误 2023-08-25 15:24:05 +08:00
zhangchenbiao
ca92665020 消息图片更换 2023-08-25 11:23:26 +08:00
xiaodong.hu
3a8334b8fc Merge branch 'hxd/feat/labelAndlLine' into dev/feat/partner1.3_20230828 2023-08-24 15:41:21 +08:00
xiaodong.hu
d62816d6f2 添加导入线索姓名长度校验 2023-08-24 15:40:48 +08:00
zhangchenbiao
4504c58b7e 新增逾期作废状态 2023-08-24 10:30:11 +08:00
zhangchenbiao
a655ddefb0 新增逾期完成 2023-08-23 19:46:12 +08:00
苏竹红
834b493035 通知 添加必要空格 2023-08-23 10:52:43 +08:00
俞扬
5737257c75 电话呼出报错信息优化 2023-08-21 20:15:52 +08:00
苏竹红
1c27d8403d 飞书通知修改 2023-08-21 17:42:47 +08:00
俞扬
e2490fdb96 Merge remote-tracking branch 'origin/dev/feat/partner1.3_20230828' into dev/feat/partner1.3_20230828 2023-08-21 16:38:58 +08:00
俞扬
389f7062a3 电话呼出提示信息优化 2023-08-21 16:38:44 +08:00
zhangchenbiao
4a42a7e7e9 产品要求 更改报错文案 2023-08-21 16:26:48 +08:00
zhangchenbiao
6362d50366 通知图片更改&跟进任务状态跟新sql调整 2023-08-21 14:33:44 +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
zhangchenbiao
bfb8d1d22d 通知优化 区分各个类型 2023-08-18 17:19:22 +08:00
苏竹红
d9a2e0dccc 装让添加校验 2023-08-18 10:30:07 +08:00
zhangchenbiao
4c269e6538 消息发送调整 2023-08-17 11:13:57 +08:00
zhangchenbiao
fdd5c3422b 新增跟进任务的消息类型,消息发送做调整 2023-08-17 10:59:23 +08:00
zhangchenbiao
38b42624a6 定时任务调整 2023-08-17 10:25:39 +08:00