Commits · 074dd19c771ba7e8316e0a077455209ad6a5454f · jenkins / order-group · GitLab

25 Mar, 2020 10 commits
- Merge branch 'qa' of http://gitlab.freemud.com/order-group-application/order-group into qa · 074dd19c
  姜海波 committed Mar 25, 2020
  
  074dd19c Browse Files
- Merge remote-tracking branch 'remotes/origin/feature-2020/2/10-1.9.15-免配送费二期-海波' into qa · b54c6e27
  姜海波 committed Mar 25, 2020
  
  b54c6e27 Browse Files
- 调整配送费逻辑 · 402b6035
  姜海波 committed Mar 25, 2020
  
  402b6035 Browse Files
- Merge branch 'qa' of gitlab.freemud.com:order-group-application/order-group into qa · 4bad622d
  dingkai committed Mar 25, 2020
  
  4bad622d Browse Files
- Merge branch 'feature/1.9.17-Exception-20200324-dingkai' into qa · 444169b0
  dingkai committed Mar 25, 2020
  
  444169b0 Browse Files
- 删除测试代码 · f922aa52
  dingkai committed Mar 25, 2020
  
  f922aa52 Browse Files
- Merge remote-tracking branch 'remotes/origin/feature-2020/2/10-1.9.15-免配送费二期-海波' into qa · bcb67bcb
  姜海波 committed Mar 25, 2020
  
  bcb67bcb Browse Files
- 调整配送费逻辑 · bd2d8495
  姜海波 committed Mar 25, 2020
  
  bd2d8495 Browse Files
- Merge remote-tracking branch 'remotes/origin/feature-2020/2/10-1.9.15-免配送费二期-海波' into qa · d167f558
  姜海波 committed Mar 25, 2020
  
  d167f558 Browse Files
- 调整配送费逻辑 · 241f68b3
  姜海波 committed Mar 25, 2020
  
  241f68b3 Browse Files
24 Mar, 2020 5 commits
- Merge branch 'qa' of http://gitlab.freemud.com/order-group-application/order-group into qa · d9887ae3
  姜海波 committed Mar 24, 2020
  
  d9887ae3 Browse Files
- Merge remote-tracking branch 'remotes/origin/feature-2020/2/10-1.9.15-免配送费二期-海波' into qa · c8e292ee
  姜海波 committed Mar 24, 2020
  
  c8e292ee Browse Files
- 调整配送费逻辑 · 3bab54d2
  姜海波 committed Mar 24, 2020
  
  3bab54d2 Browse Files
- Merge branch 'feature/1.9.17-Exception-20200324-dingkai' into qa · f46a58fe
  dingkai committed Mar 24, 2020
  
  f46a58fe Browse Files
- 异常日志测试 · c374c7bf
  dingkai committed Mar 24, 2020
  
  c374c7bf Browse Files
23 Mar, 2020 9 commits
- Merge remote-tracking branch 'remotes/origin/feature-2020/2/10-1.9.15-免配送费二期-海波' into qa · e2329e4d
  姜海波 committed Mar 23, 2020
  
  e2329e4d Browse Files
- 调整配送费逻辑 · b7465d0f
  姜海波 committed Mar 23, 2020
  
  b7465d0f Browse Files
- 调整配送费显示 · 80469e6d
  姜海波 committed Mar 23, 2020
  
  80469e6d Browse Files
- Merge remote-tracking branch 'remotes/origin/feature-2020/2/10-1.9.15-免配送费二期-海波' into qa · f389a853
  姜海波 committed Mar 23, 2020
  
  f389a853 Browse Files
- 调整配送费显示 · 1ba8a361
  姜海波 committed Mar 23, 2020
  
  1ba8a361 Browse Files
- Merge remote-tracking branch 'remotes/origin/feature-2020/2/10-1.9.15-免配送费二期-海波' into qa · 694d3a75
  姜海波 committed Mar 23, 2020
  
  694d3a75 Browse Files
- 满额减配送费无活动逻辑判断 · 50dc0f01
  姜海波 committed Mar 23, 2020
  
  50dc0f01 Browse Files
- 满额减配送费无活动逻辑判断 · 27fdd2b5
  姜海波 committed Mar 23, 2020
  
  27fdd2b5 Browse Files
- 普罗米修斯 · 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 1 commit
- 骑手电话 · ac91ec33
  姜海波 committed Mar 19, 2020
  
  ac91ec33 Browse Files