feng.li
|
2e4e7daaed
|
Merge branch 'master' into dev/feat/partner1.5.2_20231121
|
2023-11-15 13:07:31 +08:00 |
|
xiaodong.hu
|
6d268cd523
|
Merge branch 'dev/feat/partner1.5.2_20231121' into hxd/feat/partner1.5.2
|
2023-11-13 13:39:33 +08:00 |
|
xiaodong.hu
|
53eb52227a
|
添加公海私海分页
|
2023-11-13 10:41:15 +08:00 |
|
feng.li
|
fcd0b44f34
|
小程序端预约时间列表修改
|
2023-11-10 16:08:02 +08:00 |
|
feng.li
|
87a957ddcd
|
发起800审批加盟类型字段修改
|
2023-11-09 18:06:59 +08:00 |
|
feng.li
|
18bec32568
|
面试详情增加预约情况相关信息
|
2023-11-09 17:03:30 +08:00 |
|
feng.li
|
8c66ecab70
|
Merge remote-tracking branch 'origin/dev/feat/partner1.5.2_20231121' into dev/feat/partner1.5.2_20231121
|
2023-11-09 16:19:15 +08:00 |
|
feng.li
|
ff86296106
|
预约时间列表增加是否本人预约时段字段
|
2023-11-09 16:19:02 +08:00 |
|
苏竹红
|
107dc5d97e
|
私海列表 逻辑修改
|
2023-11-09 14:56:23 +08:00 |
|
feng.li
|
80f0f5b6d2
|
工作台预约面试待审核的增加对应时段预约情况信息
|
2023-11-09 14:43:56 +08:00 |
|
feng.li
|
f1c458a280
|
招商经理直接预约面试
|
2023-11-08 17:13:02 +08:00 |
|
feng.li
|
b600d80d10
|
Merge branch 'master' into dev/feat/partner1.5.2_20231121
|
2023-11-08 14:28:16 +08:00 |
|
feng.li
|
790846c5d8
|
获取各预约时间段预约情况bug-fix
|
2023-11-08 14:27:57 +08:00 |
|
feng.li
|
027e972482
|
获取各预约时间段预约情况
|
2023-11-07 22:41:00 +08:00 |
|
xiaodong.hu
|
bb63eee4fa
|
更改ec日志展示
|
2023-10-30 18:02:57 +08:00 |
|
xiaodong.hu
|
5498832bd4
|
更改手机号校验code码，重构ec同步代码
|
2023-10-27 13:55:38 +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
|
3e0b0321f3
|
feishuUserId设置遗漏
|
2023-10-26 17:51:03 +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
|
5311eb94d2
|
添加事件中心发送短信&优化代码&添加单测
|
2023-10-24 13:56:54 +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 |
|
苏竹红
|
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 |
|
苏竹红
|
8f47bdfc55
|
在线状态
|
2023-10-20 10:41:22 +08:00 |
|
陈伏伽
|
ac68c59ab4
|
意向区域id修改成路径
|
2023-10-19 17:33:26 +08:00 |
|
陈伏伽
|
0ca2897252
|
标签组及子标签接口
|
2023-10-19 17:19:30 +08:00 |
|
陈伏伽
|
98c01656d9
|
用户私海查询调整
|
2023-10-19 15:37:34 +08:00 |
|
陈伏伽
|
1616aff2f8
|
request添加入参
|
2023-10-19 14:21:33 +08:00 |
|
zhangchenbiao
|
0bae71ac94
|
部门更新
|
2023-10-09 10:32:44 +08:00 |
|
xiaodong.hu
|
2e23c295f2
|
更改800请求来源直接调用；修复800回调失败
|
2023-09-25 18:14:11 +08:00 |
|
feng.li
|
8f3d16df4f
|
Merge remote-tracking branch 'origin/dev/feat/partner1.4_20231009' into dev/feat/partner1.4_20231009
|
2023-09-22 16:06:26 +08:00 |
|
zhangchenbiao
|
c723af1381
|
Merge remote-tracking branch 'hs/dev/feat/partner1.4_20231009' into dev/feat/partner1.4_20231009
|
2023-09-22 14:40:59 +08:00 |
|
zhangchenbiao
|
25471df161
|
删除不用字段
|
2023-09-22 14:40:11 +08:00 |
|
feng.li
|
bd78c693c8
|
面试开始前一天及30分钟前提醒
|
2023-09-22 14:23:28 +08:00 |
|
俞扬
|
cb15d0e045
|
点单小程序跳转
|
2023-09-19 16:46:51 +08:00 |
|
苏竹红
|
e1fa7c0d72
|
添加字段
|
2023-09-19 10:37:30 +08:00 |
|
俞扬
|
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
|
665ffc974b
|
新增恶心的时间搜索
|
2023-09-15 16:39:56 +08:00 |
|
苏竹红
|
403534f808
|
类型改为Integer
|
2023-09-15 16:34:56 +08:00 |
|
苏竹红
|
c62c2a5192
|
是否有认识的人 逻辑添加
|
2023-09-15 12:23:22 +08:00 |
|
苏竹红
|
96550202b4
|
添加字段
|
2023-09-15 11:06:36 +08:00 |
|
苏竹红
|
e1fc5487e4
|
queryBaseInfo 常州区域
|
2023-09-14 19:37:43 +08:00 |
|
苏竹红
|
0d0c08ead2
|
Ec 意向区域回显
|
2023-09-14 19:22:39 +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 |
|