Commits · 3b842f765878cf82e3e739ab46fc035b7a03da23 · jenkins / order-group · GitLab

26 Mar, 2020 7 commits
- Merge remote-tracking branch 'remotes/origin/feature-2020/2/10-1.9.15-免配送费二期-海波' into qa · 3b842f76
```
# Conflicts:
#	shopping-cart-application-service/src/main/java/cn/freemud/service/impl/ShoppingCartNewServiceImpl.java
```
  姜海波 committed Mar 26, 2020
  3b842f76 Browse Files
- Merge remote-tracking branch 'remotes/origin/feature-2020/2/10-1.9.15-免配送费二期-海波' into qa · abddbcbb
```
# Conflicts:
#	shopping-cart-application-service/src/main/java/cn/freemud/service/impl/ShoppingCartNewServiceImpl.java
```
  姜海波 committed Mar 26, 2020
  abddbcbb Browse Files
- Merge remote-tracking branch 'remotes/origin/feature-2020/2/10-1.9.15-免配送费二期-海波' into qa · e2071203
```
# Conflicts:
#	shopping-cart-application-service/src/main/java/cn/freemud/service/impl/ShoppingCartNewServiceImpl.java
```
  姜海波 committed Mar 26, 2020
  e2071203 Browse Files
- Merge remote-tracking branch 'remotes/origin/feature-2020/2/10-1.9.15-免配送费二期-海波' into qa · a2947ee5
```
# Conflicts:
#	shopping-cart-application-service/src/main/java/cn/freemud/service/impl/ShoppingCartNewServiceImpl.java
```
  姜海波 committed Mar 26, 2020
  a2947ee5 Browse Files
- 调整配送费保存活动号 · 2d05dbc7
  姜海波 committed Mar 26, 2020
  
  2d05dbc7 Browse Files
- 调整配送费小数点 · ee92f0e4
  姜海波 committed Mar 26, 2020
  
  ee92f0e4 Browse Files
- 调整配送费小数点 · c86215f2
  姜海波 committed Mar 26, 2020
  
  c86215f2 Browse Files
25 Mar, 2020 23 commits
- Merge branch 'qa' of http://gitlab.freemud.com/order-group-application/order-group into qa · a0d2a199
  姜海波 committed Mar 25, 2020
  
  a0d2a199 Browse Files
- 调整配送费小数点 · 0833d94d
  姜海波 committed Mar 25, 2020
  
  0833d94d Browse Files
- Merge branch 'feature/1.9.17-Exception-20200325-dingkai' into qa · b2b597be
  dingkai committed Mar 25, 2020
  
  b2b597be Browse Files
- Merge remote-tracking branch 'remotes/origin/feature-2020/2/10-1.9.15-免配送费二期-海波' into qa · 7c317dd4
  姜海波 committed Mar 25, 2020
  
  7c317dd4 Browse Files
- 调整配送费小数点 · 2ca0bb30
  姜海波 committed Mar 25, 2020
  
  2ca0bb30 Browse Files
- 日志优化-升级sdk-common-base · 6204a0cb
  dingkai committed Mar 25, 2020
  
  6204a0cb Browse Files
- Merge remote-tracking branch 'remotes/origin/feature-2020/2/10-1.9.15-免配送费二期-海波' into qa · 497cb291
  姜海波 committed Mar 25, 2020
  
  497cb291 Browse Files
- 调整配送费逻辑 · bc969aca
  姜海波 committed Mar 25, 2020
  
  bc969aca Browse Files
- Merge remote-tracking branch 'remotes/origin/feature-2020/2/10-1.9.15-免配送费二期-海波' into qa · 3906b3ba
  姜海波 committed Mar 25, 2020
  
  3906b3ba Browse Files
- 调整配送费逻辑 · 00432d0f
  姜海波 committed Mar 25, 2020
  
  00432d0f Browse Files
- Merge remote-tracking branch 'remotes/origin/feature-2020/2/10-1.9.15-免配送费二期-海波' into qa · dc07071f
  姜海波 committed Mar 25, 2020
  
  dc07071f Browse Files
- 调整配送费逻辑 · 168797c7
  姜海波 committed Mar 25, 2020
  
  168797c7 Browse Files
- 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
- 日志优化 · 2db2e258
  dingkai committed Mar 25, 2020
  
  2db2e258 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 5 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