Commits · 4d3969d94cef358ab7f9c8c412d0386155f85a55 · jenkins / order-group · GitLab

20 Mar, 2020 3 commits
- Merge branch 'feature-2020/2/10-1.9.15-免配送费二期-海波' into qa · 4d3969d9
```
# Conflicts:
#	order-management/pom.xml
```
  姜海波 committed Mar 20, 2020
  4d3969d9 Browse Files
- Merge branch 'feature-2020/2/10-1.9.15-免配送费二期-海波' into qa · 998dab5a
```
# Conflicts:
#	order-management/pom.xml
```
  姜海波 committed Mar 20, 2020
  998dab5a Browse Files
- 合并最新master分支 · 36e664b4
  姜海波 committed Mar 20, 2020
  
  36e664b4 Browse Files
19 Mar, 2020 8 commits
- 骑手电话 · ac91ec33
  姜海波 committed Mar 19, 2020
  
  ac91ec33 Browse Files
- 骑手电话 · 6780c777
  姜海波 committed Mar 19, 2020
  
  6780c777 Browse Files
- Merge branch 'feature/20200319_队列缓存自动过期' into qa · 08fd2491
```
# Conflicts:
#	order-management/pom.xml
```
  shuhu.hou committed Mar 19, 2020
  08fd2491 Browse Files
- 订单分发器队列缓存自动过期 · 43dea5db
  shuhu.hou committed Mar 19, 2020
  
  43dea5db Browse Files
- 15紧急需求 · 74b73e4d
  姜海波 committed Mar 19, 2020
  
  74b73e4d Browse Files
- Merge remote-tracking branch 'remotes/origin/feature/15_配送信息remark' · a130cfa1
  family committed Mar 19, 2020
  
  a130cfa1 Browse Files
- change:非空 · e86d6aa0
  family committed Mar 19, 2020
  
  e86d6aa0 Browse Files
- Merge remote-tracking branch 'remotes/origin/feature/15_配送信息remark' · 4a5d7893
  family committed Mar 19, 2020
  
  4a5d7893 Browse Files
18 Mar, 2020 8 commits
- 门店SDK版本替换2 · 07693aef
  ping.wu committed Mar 18, 2020
  
  07693aef Browse Files
- 门店SDK版本替换 · b15a918d
  ping.wu committed Mar 18, 2020
  
  b15a918d Browse Files
- 门店SDK升级RELEASE · ca146f0f
  ping.wu committed Mar 18, 2020
  
  ca146f0f Browse Files
- 预约单升级RELEASE · 90c63657
  ping.wu committed Mar 18, 2020
  
  90c63657 Browse Files
- Merge branches 'feature/20200303_预约单2_wuping' and 'master' of… · 99820ee7
```
Merge branches 'feature/20200303_预约单2_wuping' and 'master' of http://gitlab.freemud.com/order-group-application/order-group
```
  ping.wu committed Mar 18, 2020
  99820ee7 Browse Files
- 满额减配送费 · 5edf0984
  姜海波 committed Mar 18, 2020
  
  5edf0984 Browse Files
- 15紧急需求 · 55b2a1df
  姜海波 committed Mar 18, 2020
  
  55b2a1df Browse Files
- 15紧急需求 · d73d5573
  姜海波 committed Mar 18, 2020
  
  d73d5573 Browse Files
17 Mar, 2020 9 commits
- 报错修改 · 6f4cf27e
  ping.wu committed Mar 17, 2020
  
  6f4cf27e Browse Files
- 报错修改 · 8b262bcf
  ping.wu committed Mar 17, 2020
  
  8b262bcf Browse Files
- Merge branches 'feature/20200303_预约单2_wuping' and 'qa' of… · 34268bba
```
Merge branches 'feature/20200303_预约单2_wuping' and 'qa' of http://gitlab.freemud.com/order-group-application/order-group into qa
```
  ping.wu committed Mar 17, 2020
  34268bba Browse Files
- 老订单类型转新订单枚举 · 173db880
  ping.wu committed Mar 17, 2020
  
  173db880 Browse Files
- 接单超时时间修改 · 3691499c
  ping.wu committed Mar 17, 2020
  
  3691499c Browse Files
- 接单超时时间判断修改 · fc9e2e0a
  ping.wu committed Mar 17, 2020
  
  fc9e2e0a Browse Files
- 预约单接单接口增加预约任务，创建订单预约任务修改 · 34721912
  ping.wu committed Mar 17, 2020
  
  34721912 Browse Files
- Merge branches 'feature/20200303_预约单2_wuping' and 'qa' of… · b41419d2
```
Merge branches 'feature/20200303_预约单2_wuping' and 'qa' of http://gitlab.freemud.com/order-group-application/order-group into qa
```
  ping.wu committed Mar 17, 2020
  b41419d2 Browse Files
- 创建配送单预约时间判断错误修改 · 9a3b33f2
  ping.wu committed Mar 17, 2020
  
  9a3b33f2 Browse Files
16 Mar, 2020 4 commits
- Merge branches 'feature/20200303_预约单2_wuping' and 'qa' of… · d6dd45a7
```
Merge branches 'feature/20200303_预约单2_wuping' and 'qa' of http://gitlab.freemud.com/order-group-application/order-group into qa
```
  ping.wu committed Mar 16, 2020
  d6dd45a7 Browse Files
- 创建配送单预约时间错误修改时间，超时自动接单调整 · 16c4f92a
  ping.wu committed Mar 16, 2020
  
  16c4f92a Browse Files
- Merge branches 'feature/20200303_预约单2_wuping' and 'qa' of… · 7de86069
```
Merge branches 'feature/20200303_预约单2_wuping' and 'qa' of http://gitlab.freemud.com/order-group-application/order-group into qa
```
  ping.wu committed Mar 16, 2020
  7de86069 Browse Files
- 取餐时间判断修改 · 835dec78
  ping.wu committed Mar 16, 2020
  
  835dec78 Browse Files
13 Mar, 2020 3 commits
- Add:配送回调补全remark · 549d70aa
  family committed Mar 13, 2020
  
  549d70aa Browse Files
- Add:配送回调补全remark · 271a87d2
  family committed Mar 13, 2020
  
  271a87d2 Browse Files
- 储值卡支付查询购物车金额接口配送费调整 · d63df331
  ping.wu committed Mar 13, 2020
  
  d63df331 Browse Files
12 Mar, 2020 5 commits
- 微信订单上传换队列 · 6f2465e0
  shuhu.hou committed Mar 12, 2020
  
  6f2465e0 Browse Files
- 微信订单上传换队列 · 2412d9fa
  shuhu.hou committed Mar 12, 2020
  
  2412d9fa Browse Files
- Merge branches 'feature/20200303_预约单2_wuping' and 'qa' of… · d5abae8d
```
Merge branches 'feature/20200303_预约单2_wuping' and 'qa' of http://gitlab.freemud.com/order-group-application/order-group into qa
```
  ping.wu committed Mar 12, 2020
  d5abae8d Browse Files
- 未营业可以下预约单调整 · bd1d4b3e
  ping.wu committed Mar 12, 2020
  
  bd1d4b3e Browse Files
- Merge branches 'feature/20200303_预约单2_wuping' and 'qa' of… · e1c05d34
```
Merge branches 'feature/20200303_预约单2_wuping' and 'qa' of http://gitlab.freemud.com/order-group-application/order-group into qa
```
  ping.wu committed Mar 12, 2020
  e1c05d34 Browse Files