Commit Graph

967 Commits

Author SHA1 Message Date
俞扬
5737257c75 电话呼出报错信息优化 2023-08-21 20:15:52 +08:00
俞扬
91de6d9e70 Merge remote-tracking branch 'origin/dev/feat/partner1.3_20230828' into dev/feat/partner1.3_20230828 2023-08-21 20:13:34 +08:00
俞扬
23cd5424e4 电话呼出白名单配置修改 2023-08-21 20:12:57 +08:00
zhangchenbiao
d67369aeff 通知文案时间格式统一 2023-08-21 19:39:22 +08:00
feng.li
940a86e834 Merge remote-tracking branch 'origin/dev/feat/partner1.3_20230828' into dev/feat/partner1.3_20230828 2023-08-21 17:53:25 +08:00
feng.li
0d885f8d8f 修改标签组名排重 2023-08-21 17:52:58 +08:00
zhangchenbiao
b432a65435 Merge remote-tracking branch 'hs/dev/feat/partner1.3_20230828' into dev/feat/partner1.3_20230828
# Conflicts:
#	coolstore-partner-service/src/main/java/com/cool/store/service/impl/HyPartnerLineInfoServiceImpl.java
2023-08-21 17:45:26 +08:00
zhangchenbiao
92d245bee0 通知文案时间格式统一 2023-08-21 17:44:00 +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
e1f629b6f9 Merge remote-tracking branch 'hs/dev/feat/partner1.3_20230828' into dev/feat/partner1.3_20230828 2023-08-21 16:27:04 +08:00
zhangchenbiao
4a42a7e7e9 产品要求 更改报错文案 2023-08-21 16:26:48 +08:00
苏竹红
baf0283c7e Merge remote-tracking branch 'hsayi/dev/feat/partner1.3_20230828' into dev/feat/partner1.3_20230828 2023-08-21 16:18:20 +08:00
苏竹红
5ce06c3cf5 线索来源 搜索 2023-08-21 16:18:10 +08:00
zhangchenbiao
6a48131830 Merge remote-tracking branch 'hs/dev/feat/partner1.3_20230828' into dev/feat/partner1.3_20230828 2023-08-21 15:48:58 +08:00
zhangchenbiao
fc364959ef 调整更新跟进任务状态顺序 2023-08-21 15:48:50 +08:00
苏竹红
76bcc06332 Merge remote-tracking branch 'hsayi/dev/feat/partner1.3_20230828' into dev/feat/partner1.3_20230828 2023-08-21 15:29:52 +08:00
苏竹红
aace92cc49 私海列表处理 2023-08-21 15:29:40 +08:00
xiaodong.hu
f80e96ecb7 Merge branch 'hxd/feat/labelAndlLine' into dev/feat/partner1.3_20230828 2023-08-21 15:01:13 +08:00
xiaodong.hu
aad72e1ea6 添加线索初始状态 2023-08-21 14:59:38 +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
zhangchenbiao
bfb8d1d22d 通知优化 区分各个类型 2023-08-18 17:19:22 +08:00
xiaodong.hu
bbd2d6486d 添加添加线索分配标志 2023-08-18 13:35:04 +08:00
苏竹红
88c04db1cd Merge remote-tracking branch 'hsayi/dev/feat/partner1.3_20230828' into dev/feat/partner1.3_20230828 2023-08-18 10:30:16 +08:00
苏竹红
d9a2e0dccc 装让添加校验 2023-08-18 10:30:07 +08:00
zhangchenbiao
b06b98db5f 判断修复 2023-08-17 17:37:56 +08:00
zhangchenbiao
1325f48f09 Merge remote-tracking branch 'hs/dev/feat/partner1.3_20230828' into dev/feat/partner1.3_20230828 2023-08-17 16:44:01 +08:00
zhangchenbiao
0c31dbc907 跟进任务新增完成时间 2023-08-17 16:43:52 +08:00
苏竹红
6803d2c638 Merge remote-tracking branch 'hsayi/dev/feat/partner1.3_20230828' into dev/feat/partner1.3_20230828 2023-08-17 16:40:02 +08:00
苏竹红
3e29f100da 私海添加用户画像请求入参 2023-08-17 16:39:42 +08:00
feng.li
eb422d7eae 开放oss/getUploadFileConfig接口供安卓测试 2023-08-17 13:44:56 +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
zhangchenbiao
0f32c82ed1 定时任务调整 2023-08-17 10:20:54 +08:00
zhangchenbiao
e584fa82ff 定时任务调整 2023-08-17 10:16:16 +08:00
zhangchenbiao
4d62a3cd87 定时任务调整 2023-08-17 10:06:20 +08:00
zhangchenbiao
637780c52f sql 调整 2023-08-16 19:31:10 +08:00
zhangchenbiao
9b93e91c95 Merge remote-tracking branch 'hs/dev/feat/partner1.3_20230828' into dev/feat/partner1.3_20230828 2023-08-16 19:16:28 +08:00
zhangchenbiao
c030182b07 定时任务调整 2023-08-16 19:15:54 +08:00
苏竹红
4d95784cb3 请求修改请求方式 2023-08-16 17:15:31 +08:00
苏竹红
b9215bce78 Merge remote-tracking branch 'hsayi/dev/feat/partner1.3_20230828' into dev/feat/partner1.3_20230828 2023-08-16 16:21:07 +08:00
苏竹红
317927d81b 公海 2023-08-16 16:20:40 +08:00
俞扬
882f4e28d4 Merge remote-tracking branch 'origin/dev/feat/partner1.3_20230828' into dev/feat/partner1.3_20230828 2023-08-16 16:04:56 +08:00
俞扬
eb5441b4a0 电话呼出日志优化 2023-08-16 16:04:46 +08:00
zhangchenbiao
4533b233df 跟进日志更改 2023-08-16 15:50:16 +08:00