Commit Graph

1185 Commits

Author SHA1 Message Date
xiaodong.hu
5498832bd4 更改手机号校验code码,重构ec同步代码 2023-10-27 13:55:38 +08:00
xiaodong.hu
19993c9ce8 补充ApiException 2023-10-26 19:11:28 +08:00
xiaodong.hu
d9a7606579 Merge branch 'hxd/feat/partner1.5' into dev/feat/partner1.5_20231106
# Conflicts:
#	coolstore-partner-service/src/main/java/com/cool/store/service/FollowTaskService.java
#	coolstore-partner-service/src/main/java/com/cool/store/service/impl/FollowTaskServiceImpl.java
#	coolstore-partner-webb/src/main/java/com/cool/store/controller/FollowTaskController.java
2023-10-26 19:04:09 +08:00
xiaodong.hu
107bfe9d35 提交ec同步历史线索功能 2023-10-26 18:59:38 +08:00
feng.li
d2c24e307a Merge remote-tracking branch 'origin/dev/feat/partner1.5_20231106' into dev/feat/partner1.5_20231106 2023-10-26 17:51:12 +08:00
feng.li
3e0b0321f3 feishuUserId设置遗漏 2023-10-26 17:51:03 +08:00
陈伏伽
d6d71b76f6 线索搜索sql修正 2023-10-26 11:09:40 +08:00
feng.li
59e3fa13fa 替换短信发送方案为事件中心方法 2023-10-25 16:35:42 +08:00
feng.li
e4fd819abf 转让招商经理发送消息卡片bug fix 2023-10-25 16:06:42 +08:00
feng.li
3acf5ad9bc 预约面试发送消息卡片修改方法遗漏 2023-10-25 15:21:44 +08:00
feng.li
4c73375592 EnterpriseUserMapper问题修改 2023-10-25 15:04:21 +08:00
feng.li
0b844e64b6 发送飞书消息的地方更改为使用feishu_user_id 2023-10-25 13:22:31 +08:00
feng.li
fe3d706fbb enterprise_user相关mapper增加feishu_user_id并添加根据user_id批量获取feishu_user_id 2023-10-25 11:39:24 +08:00
feng.li
b3c1fcdb98 Merge remote-tracking branch 'origin/dev/feat/partner1.5_20231106' into dev/feat/partner1.5_20231106 2023-10-24 16:45:48 +08:00
feng.li
d2a6b81fa8 替换全部飞书通知发送方法为通过事件中心发送 2023-10-24 16:45:38 +08:00
苏竹红
7c1f491fc9 指定版本号 2023-10-24 15:09:24 +08:00
feng.li
5311eb94d2 添加事件中心发送短信&优化代码&添加单测 2023-10-24 13:56:54 +08:00
feng.li
9884c2f3e6 Merge remote-tracking branch 'origin/dev/feat/partner1.5_20231106' into dev/feat/partner1.5_20231106 2023-10-24 10:38:24 +08:00
俞扬
4b323b5e70 Merge remote-tracking branch 'origin/dev/feat/partner1.5_20231106' into dev/feat/partner1.5_20231106 2023-10-23 20:17:09 +08:00
俞扬
2871c5d68b 发送邀请短信-增加手机号码校验 2023-10-23 20:16:58 +08:00
feng.li
ed268f9ad1 发起资质审批增加信息缺失校验 2023-10-23 18:45:17 +08:00
feng.li
1852546bd7 添加800加盟类型字段 2023-10-23 16:11:28 +08:00
feng.li
7db4368a30 增加接入沪上阿姨事件中心相关类 2023-10-23 15:58:49 +08:00
俞扬
a27811ac9b Merge remote-tracking branch 'origin/dev/feat/partner1.5_20231106' into dev/feat/partner1.5_20231106 2023-10-23 14:19:05 +08:00
俞扬
240ba451d6 发送邀请短信-配置修改 2023-10-23 14:18:53 +08:00
苏竹红
cfde2c0c81 Merge remote-tracking branch 'hsayi/dev/feat/partner1.5_20231106' into dev/feat/partner1.5_20231106 2023-10-23 13:56:02 +08:00
苏竹红
23214127f1 招商经理 2023-10-23 13:55:44 +08:00
俞扬
4310b7577c 发送邀请短信 2023-10-23 13:49:18 +08:00
陈伏伽
d310587c0e 标签组列表排序 2023-10-20 17:38:00 +08:00
苏竹红
63dd1dd5e2 Merge remote-tracking branch 'hsayi/dev/feat/partner1.5_20231106' into dev/feat/partner1.5_20231106 2023-10-20 10:41:38 +08:00
苏竹红
8f47bdfc55 在线状态 2023-10-20 10:41:22 +08:00
feng.li
644fc6e628 Merge remote-tracking branch 'origin/dev/feat/partner1.5_20231106' into dev/feat/partner1.5_20231106 2023-10-20 10:33:40 +08:00
feng.li
45161fc9bb MDM请求增加响应校验 2023-10-20 10:32:15 +08:00
陈伏伽
ad46e015ea sql修复2 2023-10-19 18:52:58 +08:00
陈伏伽
e6c1e1989f 查询sql修复 2023-10-19 18:36:32 +08:00
陈伏伽
758d9bfa8c 查询sql修复 2023-10-19 17:58:38 +08:00
陈伏伽
07d22ae3d0 查询sql修复 2023-10-19 17:49:06 +08:00
陈伏伽
ac68c59ab4 意向区域id修改成路径 2023-10-19 17:33:26 +08:00
陈伏伽
0ca2897252 标签组及子标签接口 2023-10-19 17:19:30 +08:00
陈伏伽
82b63d6db0 用户和全量私海列表sql更改 2023-10-19 16:15:13 +08:00
陈伏伽
98c01656d9 用户私海查询调整 2023-10-19 15:37:34 +08:00
陈伏伽
1616aff2f8 request添加入参 2023-10-19 14:21:33 +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
zhangchenbiao
0ff7fc974c rollback 2023-10-09 10:35:49 +08:00
zhangchenbiao
0bae71ac94 部门更新 2023-10-09 10:32:44 +08:00
zhangchenbiao
f847c27727 Merge remote-tracking branch 'hs/dev/feat/partner1.4_20231009' into dev/feat/partner1.4_20231009 2023-10-09 10:32:21 +08:00
zhangchenbiao
1590314f66 部门更新 2023-10-09 10:32:12 +08:00
苏竹红
32fbac57a1 私海数据处理 2023-10-09 10:09:06 +08:00