Commit Graph

397 Commits

Author SHA1 Message Date
苏竹红
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
zhangchenbiao
0f32c82ed1 定时任务调整 2023-08-17 10:20:54 +08:00
zhangchenbiao
e584fa82ff 定时任务调整 2023-08-17 10:16:16 +08:00
zhangchenbiao
637780c52f sql 调整 2023-08-16 19:31:10 +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
zhangchenbiao
3a5b4ed761 修复跟进任务跟进人判断 2023-08-16 15:24:14 +08:00
zhangchenbiao
7e5e060155 同步问题修复 2023-08-16 14:58:47 +08:00
zhangchenbiao
8a98d646b8 通话记录跟进日志处理 2023-08-16 14:02:04 +08:00
zhangchenbiao
49936eacb2 通话记录跟进日志处理 2023-08-16 13:52:37 +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
zhangchenbiao
6bdc773aa5 跟进日志处理 2023-08-15 16:32:35 +08:00
zhangchenbiao
6e4dd2b45e 新增修改标签日志 2023-08-15 14:56:17 +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
zhangchenbiao
634d6ec24e 跟进任务新增通知 2023-08-14 15:03:27 +08:00
xiaodong.hu
056c9d60e9 添加线索导入与新增 2023-08-14 13:31:42 +08:00
zhangchenbiao
f7c446ba8d 逆向工程调整 2023-08-14 11:34:26 +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
俞扬
9a4a693ea5 Merge remote-tracking branch 'origin/dev/feat/partner1.3_20230828' into dev/feat/partner1.3_20230828 2023-08-11 18:24:41 +08:00
俞扬
bef67d3785 app通话回调 2023-08-11 18:24:31 +08:00
feng.li
8d1890dc74 呼出手机号数据库新增edit_user_id 2023-08-11 17:00:25 +08:00
俞扬
e5f79048f0 Merge remote-tracking branch 'origin/dev/feat/partner1.3_20230828' into dev/feat/partner1.3_20230828 2023-08-11 15:43:28 +08:00
俞扬
bb043d28d1 app通话 2023-08-11 15:43:16 +08:00
苏竹红
958e4fb441 1.3期 列表+全量私海 2023-08-11 15:08:31 +08:00
feng.li
fc97ff29ea 标签管理增删改查 2023-08-10 19:14:18 +08:00
feng.li
3c4909b8a5 标签组新增标签组名不可重复 2023-08-10 16:21:33 +08:00
feng.li
f84e9e6e27 标签管理文件同步推送 2023-08-10 16:09:10 +08:00
feng.li
a853bfb149 标签组删除逻辑修改 2023-08-10 15:40:28 +08:00
feng.li
fd896956c5 标签组增删改查 2023-08-10 13:44:00 +08:00
feng.li
fa86db7da7 呼出号码管理增删改查 2023-08-09 18:45:16 +08:00
zhangchenbiao
a64fc9cd89 字段优化 2023-08-01 15:57:00 +08:00
zhangchenbiao
c9c7bd391c 字段优化 2023-08-01 15:16:14 +08:00
zhangchenbiao
ab3ccf47bf 删除无用字段 2023-08-01 15:08:54 +08:00
zhangchenbiao
cd46416a3c 修复角色菜单临时接口 2023-08-01 14:49:05 +08:00
zhangchenbiao
d3a8e2d40e 修复角色菜单临时接口 2023-08-01 13:59:11 +08:00
zhangchenbiao
c56757e699 修复角色菜单临时接口 2023-08-01 11:43:32 +08:00
xiaodong.hu
2d93d67fb1 Merge branch 'dev/feat/partner1.1_20230727' into hxd/fix/SyncCustomer3.0 2023-07-28 13:52:25 +08:00
xiaodong.hu
0669c4ad2d Merge branch 'master' into dev/feat/partner1.1_20230727
# Conflicts:
#	coolstore-partner-dao/src/main/resources/mapper/HyPartnerUserInfoMapper.xml
#	coolstore-partner-model/src/main/java/com/cool/store/entity/HyPartnerLineInfoDO.java
#	coolstore-partner-model/src/main/java/com/cool/store/entity/HyPartnerUserInfoDO.java
2023-07-27 20:02:41 +08:00
xiaodong.hu
2a861d7904 添加招商小程序关于公海私海判断 2023-07-27 16:35:55 +08:00
xiaodong.hu
15c8b52280 修改ec变更逻辑 2023-07-26 21:04:35 +08:00
xiaodong.hu
12de722de0 更改稽核查询为模糊查询 2023-07-26 10:09:11 +08:00