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 |
|
xiaodong.hu
|
fa2d08915d
|
添加ec标签同步完整代码
|
2023-08-28 13:53:50 +08:00 |
|
zhangchenbiao
|
0fd26acfaa
|
跟进任务排序
|
2023-08-28 12:50:10 +08:00 |
|
zhangchenbiao
|
ae9fa56e77
|
Merge remote-tracking branch 'hs/dev/feat/partner1.3_20230828' into dev/feat/partner1.3_20230828
|
2023-08-28 11:46:57 +08:00 |
|
zhangchenbiao
|
66a49ae752
|
sql 调整
|
2023-08-28 11:45:41 +08:00 |
|
俞扬
|
6af1e6b3e8
|
电话呼出连接逻辑修改，增加多手机号兼容
|
2023-08-26 13:52:47 +08:00 |
|
俞扬
|
3e93ad3fb3
|
电话呼出连接逻辑修改，增加多手机号兼容
|
2023-08-26 13:44:17 +08:00 |
|
zhangchenbiao
|
e1361e0b86
|
Merge remote-tracking branch 'hs/dev/feat/partner1.3_20230828' into dev/feat/partner1.3_20230828
|
2023-08-25 18:06:35 +08:00 |
|
zhangchenbiao
|
2e372c76d3
|
通知跳转链接调整
|
2023-08-25 18:06:24 +08:00 |
|
xiaodong.hu
|
05c6ef16bd
|
添加ec标签同步部分代码
|
2023-08-25 17:56:02 +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
|
45a24be5dd
|
Merge remote-tracking branch 'hs/dev/feat/partner1.3_20230828' into dev/feat/partner1.3_20230828
|
2023-08-25 14:26:22 +08:00 |
|
zhangchenbiao
|
95c74e198e
|
换绑操作日志处理
|
2023-08-25 14:26:15 +08:00 |
|
xiaodong.hu
|
76a24e2b14
|
提交ec同步部分代码
|
2023-08-25 14:13:55 +08:00 |
|
xiaodong.hu
|
14e95b4444
|
Merge branch 'hxd/feat/labelAndlLine' into dev/feat/partner1.3_20230828
|
2023-08-25 13:36:27 +08:00 |
|
xiaodong.hu
|
dd87e8caf7
|
修复excel超过五百行报错
|
2023-08-25 13:35:44 +08:00 |
|
zhangchenbiao
|
6c36513fab
|
Merge remote-tracking branch 'hs/dev/feat/partner1.3_20230828' into dev/feat/partner1.3_20230828
|
2023-08-25 11:23:33 +08:00 |
|
zhangchenbiao
|
ca92665020
|
消息图片更换
|
2023-08-25 11:23:26 +08:00 |
|
苏竹红
|
054c3f420b
|
标签换绑
|
2023-08-25 10:50:43 +08:00 |
|
苏竹红
|
b55e79fa91
|
Merge remote-tracking branch 'hsayi/dev/feat/partner1.3_20230828' into dev/feat/partner1.3_20230828
|
2023-08-25 10:48:04 +08:00 |
|
苏竹红
|
7b0946ef4b
|
标签换绑
|
2023-08-25 10:47:51 +08:00 |
|
zhangchenbiao
|
9d3b181885
|
Merge remote-tracking branch 'hs/dev/feat/partner1.3_20230828' into dev/feat/partner1.3_20230828
|
2023-08-24 19:00:41 +08:00 |
|
zhangchenbiao
|
a551efda44
|
修改招商区域设置分页排序
|
2023-08-24 19:00:34 +08:00 |
|
xiaodong.hu
|
44e5def3e4
|
Merge branch 'hxd/feat/labelAndlLine' into dev/feat/partner1.3_20230828
|
2023-08-24 18:45:58 +08:00 |
|
xiaodong.hu
|
bf75ac3815
|
修复招商客户姓名为空的情况
|
2023-08-24 18:44:16 +08:00 |
|
zhangchenbiao
|
9ebff24684
|
修改备注
|
2023-08-24 17:36:01 +08:00 |
|
zhangchenbiao
|
77389e6102
|
编辑跟进任务一小时内发送消息
|
2023-08-24 17:07:07 +08:00 |
|
苏竹红
|
cf584639d9
|
Merge remote-tracking branch 'hsayi/dev/feat/partner1.3_20230828' into dev/feat/partner1.3_20230828
|
2023-08-24 17:02:07 +08:00 |
|
苏竹红
|
e84004e6ad
|
工作通知 名称手机号 从userInfo表中获取
|
2023-08-24 17:01:58 +08:00 |
|
苏竹红
|
f35ae5802c
|
工作通知 名称手机号 从userInfo表中获取
|
2023-08-24 16:57:09 +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 |
|
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
|
00ee314e13
|
标签没修改 不写操作日志，跟进任务编辑状态判断
|
2023-08-23 19:29:05 +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
|
9072609c23
|
呼出手机号编辑时值不变更新时间不变fix
|
2023-08-23 14:47:02 +08:00 |
|