Commits · c2cb2681cd37630c042e02a9f713283caac3ee5c · jenkins / order-group · GitLab

23 Mar, 2020 1 commit
- 普罗米修斯 · c2cb2681
  姜海波 committed Mar 23, 2020
  
  c2cb2681 Browse Files
20 Mar, 2020 15 commits
- Merge remote-tracking branch 'remotes/origin/feature-2020/2/10-1.9.15-免配送费二期-海波' into qa · 036e0640
  姜海波 committed Mar 20, 2020
  
  036e0640 Browse Files
- 满额减配送费 · eed6d772
  姜海波 committed Mar 20, 2020
  
  eed6d772 Browse Files
- Merge remote-tracking branch 'remotes/origin/feature-2020/2/10-1.9.15-免配送费二期-海波' into qa · 6e4752ac
  姜海波 committed Mar 20, 2020
  
  6e4752ac Browse Files
- 满额减配送费 · b9cd30a5
  姜海波 committed Mar 20, 2020
  
  b9cd30a5 Browse Files
- 满额减配送费 · 615d2753
  姜海波 committed Mar 20, 2020
  
  615d2753 Browse Files
- 修改receiveId判断 · 2f389e01
  姜海波 committed Mar 20, 2020
  
  2f389e01 Browse Files
- Merge branch 'qa' of http://gitlab.freemud.com/order-group-application/order-group into qa · f6b5978c
  姜海波 committed Mar 20, 2020
  
  f6b5978c Browse Files
- Merge branch 'feature-2020/2/10-1.9.15-免配送费二期-海波' into qa · bc2dbe38
  姜海波 committed Mar 20, 2020
  
  bc2dbe38 Browse Files
- Merge remote-tracking branch 'remotes/origin/feature-2020/2/10-1.9.15-免配送费二期-海波' into qa · 8f7e116f
  姜海波 committed Mar 20, 2020
  
  8f7e116f Browse Files
- 修改receiveId判断 · 342b8534
  姜海波 committed Mar 20, 2020
  
  342b8534 Browse Files
- 注释满减配送费逻辑 · 21bf41cd
  shuhu.hou@freemud.cn committed Mar 20, 2020
  
  21bf41cd Browse Files
- Merge branch 'feature-2020/2/10-1.9.15-免配送费二期-海波' into qa · 63eb3d4d
```
# Conflicts:
#	order-management/pom.xml
```
  姜海波 committed Mar 20, 2020
  63eb3d4d Browse Files
- 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 8 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