Commits · fb54c6ba1046d3ee32895fd1bc87e0e8722012ae · jenkins / order-group · GitLab

27 Mar, 2020 2 commits
- Merge branch 'feature/1.9.17-Exception-20200325-dingkai' into qa · fb54c6ba
  dingkai committed Mar 27, 2020
  
  fb54c6ba Browse Files
- 判断优化 · bb0af414
  dingkai committed Mar 27, 2020
  
  bb0af414 Browse Files
26 Mar, 2020 17 commits
- 调整浮点 · dc8c73cb
  姜海波 committed Mar 26, 2020
  
  dc8c73cb Browse Files
- Merge remote-tracking branch 'remotes/origin/feature-2020/2/10-1.9.15-免配送费二期-海波' into qa · bf224760
```
# Conflicts:
#	shopping-cart-application-service/src/main/java/cn/freemud/service/impl/ShoppingCartNewServiceImpl.java
```
  姜海波 committed Mar 26, 2020
  bf224760 Browse Files
- Merge remote-tracking branch 'remotes/origin/feature-2020/2/10-1.9.15-免配送费二期-海波' into qa · dfdeb9f5
```
# Conflicts:
#	shopping-cart-application-service/src/main/java/cn/freemud/service/impl/ShoppingCartNewServiceImpl.java
```
  姜海波 committed Mar 26, 2020
  dfdeb9f5 Browse Files
- Merge remote-tracking branch 'remotes/origin/feature-2020/2/10-1.9.15-免配送费二期-海波' into qa · 72307fe8
```
# Conflicts:
#	shopping-cart-application-service/src/main/java/cn/freemud/service/impl/ShoppingCartNewServiceImpl.java
```
  姜海波 committed Mar 26, 2020
  72307fe8 Browse Files
- Merge remote-tracking branch 'remotes/origin/feature-2020/2/10-1.9.15-免配送费二期-海波' into qa · f7c67bdb
```
# Conflicts:
#	shopping-cart-application-service/src/main/java/cn/freemud/service/impl/ShoppingCartNewServiceImpl.java
```
  姜海波 committed Mar 26, 2020
  f7c67bdb Browse Files
- Merge remote-tracking branch 'remotes/origin/feature-2020/2/10-1.9.15-免配送费二期-海波' into qa · cc17cdf6
```
# Conflicts:
#	shopping-cart-application-service/src/main/java/cn/freemud/service/impl/ShoppingCartNewServiceImpl.java
```
  姜海波 committed Mar 26, 2020
  cc17cdf6 Browse Files
- Merge remote-tracking branch 'remotes/origin/feature-2020/2/10-1.9.15-免配送费二期-海波' into qa · 0671c71b
  姜海波 committed Mar 26, 2020
  
  0671c71b Browse Files
- Merge remote-tracking branch 'remotes/origin/feature-2020/2/10-1.9.15-免配送费二期-海波' into qa · cfb77202
```
# Conflicts:
#	shopping-cart-application-service/src/main/java/cn/freemud/service/impl/ShoppingCartNewServiceImpl.java
```
  姜海波 committed Mar 26, 2020
  cfb77202 Browse Files
- Merge remote-tracking branch 'remotes/origin/feature-2020/2/10-1.9.15-免配送费二期-海波' into qa · 425f6d6c
  姜海波 committed Mar 26, 2020
  
  425f6d6c Browse Files
- Merge remote-tracking branch 'remotes/origin/feature-2020/2/10-1.9.15-免配送费二期-海波' into qa · 7d226603
```
# Conflicts:
#	shopping-cart-application-service/src/main/java/cn/freemud/service/impl/ShoppingCartNewServiceImpl.java
```
  姜海波 committed Mar 26, 2020
  7d226603 Browse Files
- 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 21 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