俞扬
|
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 |
|
zhangchenbiao
|
6dc8d68280
|
fix
|
2023-09-15 09:45:36 +08:00 |
|
zhangchenbiao
|
1be2b624d2
|
Merge remote-tracking branch 'hs/dev/feat/partner1.4_20231009' into dev/feat/partner1.4_20231009
|
2023-09-14 19:31:37 +08:00 |
|
zhangchenbiao
|
ab0ff87463
|
fix
|
2023-09-14 19:30:44 +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 |
|
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 |
|
feng.li
|
bc5d3da802
|
接口说明文字修改
|
2023-09-12 14:19:34 +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 |
|
zhangchenbiao
|
331da47300
|
删除corpId
|
2023-09-08 10:45:33 +08:00 |
|
俞扬
|
7bd7474858
|
Merge remote-tracking branch 'origin/dev/feat/partner1.3_20230904' into dev/feat/partner1.3_20230904
|
2023-09-05 20:36:46 +08:00 |
|
俞扬
|
2fbeb8864a
|
通话回调接口调整
|
2023-09-05 20:36:32 +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
|
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 |
|
俞扬
|
3e93ad3fb3
|
电话呼出连接逻辑修改，增加多手机号兼容
|
2023-08-26 13:44:17 +08:00 |
|
xiaodong.hu
|
76a24e2b14
|
提交ec同步部分代码
|
2023-08-25 14:13:55 +08:00 |
|
zhangchenbiao
|
47627a1945
|
定时任务逻辑调整
|
2023-08-22 15:03:01 +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 |
|
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 |
|
苏竹红
|
1c27d8403d
|
飞书通知修改
|
2023-08-21 17:42:47 +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 |
|
苏竹红
|
4d95784cb3
|
请求修改请求方式
|
2023-08-16 17:15:31 +08:00 |
|
zhangchenbiao
|
4533b233df
|
跟进日志更改
|
2023-08-16 15:50:16 +08:00 |
|
xiaodong.hu
|
b71fd6c8bb
|
Merge branch 'dev/feat/partner1.3_20230828' into hxd/feat/labelAndlLine
|
2023-08-16 13:20:16 +08:00 |
|
xiaodong.hu
|
4e9903b1b6
|
添加与完善线索导入与新增
|
2023-08-16 13:18:55 +08:00 |
|
俞扬
|
106975a3e6
|
优化呼出接口
|
2023-08-14 16:06:56 +08:00 |
|
xiaodong.hu
|
d1cd47bc96
|
Merge branch 'dev/feat/partner1.3_20230828' into hxd/feat/labelAndlLine
# Conflicts:
# coolstore-partner-common/src/main/java/com/cool/store/enums/ErrorCodeEnum.java
# coolstore-partner-service/pom.xml
|
2023-08-14 15:10:31 +08:00 |
|
xiaodong.hu
|
056c9d60e9
|
添加线索导入与新增
|
2023-08-14 13:31:42 +08:00 |
|
zhangchenbiao
|
c937038d75
|
Merge remote-tracking branch 'hs/dev/feat/partner1.3_20230828' into dev/feat/partner1.3_20230828
|
2023-08-14 10:51:38 +08:00 |
|
zhangchenbiao
|
a54a84a285
|
跟进任务初始化
|
2023-08-14 10:51:30 +08:00 |
|
俞扬
|
bef67d3785
|
app通话回调
|
2023-08-11 18:24:31 +08:00 |
|
苏竹红
|
958e4fb441
|
1.3期 列表+全量私海
|
2023-08-11 15:08:31 +08:00 |
|
俞扬
|
856260d5da
|
Merge remote-tracking branch 'origin/dev/feat/partner1.3_20230828' into dev/feat/partner1.3_20230828
|
2023-08-11 11:41:14 +08:00 |
|
俞扬
|
e52c30cff0
|
websocket
|
2023-08-11 11:40:56 +08:00 |
|
feng.li
|
4b49b2e59f
|
标签更新防重
|
2023-08-11 10:49:55 +08:00 |
|
feng.li
|
fc97ff29ea
|
标签管理增删改查
|
2023-08-10 19:14:18 +08:00 |
|