Commits · deafb006bc380e73e7f9836d95bf9be793a749ee · jenkins / order-group

30 Mar, 2020 2 commits
- 忽略iml文件 · deafb006
  shuhu.hou@freemud.cn committed Mar 30, 2020
  
  deafb006 Browse Files
- 修复即时单和预约单不返还打包费 · be871695
  shuhu.hou@freemud.cn committed Mar 30, 2020
  
  be871695 Browse Files
28 Mar, 2020 1 commit
- 测试注册 · 5451e4b1
  姜海波 committed Mar 28, 2020
  
  5451e4b1 Browse Files
26 Mar, 2020 19 commits
- 调整浮点 · a245b697
  姜海波 committed Mar 26, 2020
  
  a245b697 Browse Files
- 调整浮点 · 364550d2
  姜海波 committed Mar 26, 2020
  
  364550d2 Browse Files
- 调整浮点 · b1f522c3
  姜海波 committed Mar 26, 2020
  
  b1f522c3 Browse Files
- Merge remote-tracking branch 'remotes/origin/feature-2020/2/10-1.9.15-免配送费二期-海波' into qa · b9da6459
```
# Conflicts:
#	shopping-cart-application-service/src/main/java/cn/freemud/service/impl/ShoppingCartNewServiceImpl.java
```
  姜海波 committed Mar 26, 2020
  b9da6459 Browse Files
- Merge remote-tracking branch 'remotes/origin/feature-2020/2/10-1.9.15-免配送费二期-海波' into qa · 15d595df
```
# Conflicts:
#	shopping-cart-application-service/src/main/java/cn/freemud/service/impl/ShoppingCartNewServiceImpl.java
```
  姜海波 committed Mar 26, 2020
  15d595df Browse Files
- Merge remote-tracking branch 'remotes/origin/feature-2020/2/10-1.9.15-免配送费二期-海波' into qa · d79499af
```
# Conflicts:
#	shopping-cart-application-service/src/main/java/cn/freemud/service/impl/ShoppingCartNewServiceImpl.java
```
  姜海波 committed Mar 26, 2020
  d79499af Browse Files
- Merge remote-tracking branch 'remotes/origin/feature-2020/2/10-1.9.15-免配送费二期-海波' into qa · 2a86fae9
```
# Conflicts:
#	shopping-cart-application-service/src/main/java/cn/freemud/service/impl/ShoppingCartNewServiceImpl.java
```
  姜海波 committed Mar 26, 2020
  2a86fae9 Browse Files
- Merge remote-tracking branch 'remotes/origin/feature-2020/2/10-1.9.15-免配送费二期-海波' into qa · eff27a05
```
# Conflicts:
#	shopping-cart-application-service/src/main/java/cn/freemud/service/impl/ShoppingCartNewServiceImpl.java
```
  姜海波 committed Mar 26, 2020
  eff27a05 Browse Files
- Merge remote-tracking branch 'remotes/origin/feature-2020/2/10-1.9.15-免配送费二期-海波' into qa · 58e718aa
```
# Conflicts:
#	shopping-cart-application-service/src/main/java/cn/freemud/service/impl/ShoppingCartNewServiceImpl.java
```
  姜海波 committed Mar 26, 2020
  58e718aa Browse Files
- Merge remote-tracking branch 'remotes/origin/feature-2020/2/10-1.9.15-免配送费二期-海波' into qa · 5dde2333
```
# Conflicts:
#	shopping-cart-application-service/src/main/java/cn/freemud/service/impl/ShoppingCartNewServiceImpl.java
```
  姜海波 committed Mar 26, 2020
  5dde2333 Browse Files
- Merge branch 'feature-2020/2/10-1.9.15-免配送费二期-海波' · a5f934c3
  姜海波 committed Mar 26, 2020
  
  a5f934c3 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 · 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 · abddbcbb
```
# Conflicts:
#	shopping-cart-application-service/src/main/java/cn/freemud/service/impl/ShoppingCartNewServiceImpl.java
```
  姜海波 committed Mar 26, 2020
  abddbcbb Browse Files
- 满额减配送费 · 64bd9ee0
  dingkai committed Mar 26, 2020
  
  64bd9ee0 Browse Files
- Merge branch 'feature/1.9.15-20200310-dingkai' · 1f6639e3
  dingkai committed Mar 26, 2020
  
  1f6639e3 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 7 commits
- 调整配送费小数点 · 2ca0bb30
  姜海波 committed Mar 25, 2020
  
  2ca0bb30 Browse Files
- 调整配送费逻辑 · bc969aca
  姜海波 committed Mar 25, 2020
  
  bc969aca Browse Files
- 调整配送费逻辑 · 00432d0f
  姜海波 committed Mar 25, 2020
  
  00432d0f Browse Files
- 调整配送费逻辑 · 168797c7
  姜海波 committed Mar 25, 2020
  
  168797c7 Browse Files
- 调整配送费逻辑 · 402b6035
  姜海波 committed Mar 25, 2020
  
  402b6035 Browse Files
- 调整配送费逻辑 · bd2d8495
  姜海波 committed Mar 25, 2020
  
  bd2d8495 Browse Files
- 调整配送费逻辑 · 241f68b3
  姜海波 committed Mar 25, 2020
  
  241f68b3 Browse Files
24 Mar, 2020 1 commit
- 调整配送费逻辑 · 3bab54d2
  姜海波 committed Mar 24, 2020
  
  3bab54d2 Browse Files
23 Mar, 2020 4 commits
- 调整配送费逻辑 · b7465d0f
  姜海波 committed Mar 23, 2020
  
  b7465d0f Browse Files
- 调整配送费显示 · 1ba8a361
  姜海波 committed Mar 23, 2020
  
  1ba8a361 Browse Files
- 满额减配送费无活动逻辑判断 · 50dc0f01
  姜海波 committed Mar 23, 2020
  
  50dc0f01 Browse Files
- 满额减配送费无活动逻辑判断 · 27fdd2b5
  姜海波 committed Mar 23, 2020
  
  27fdd2b5 Browse Files
20 Mar, 2020 6 commits
- 满额减配送费 · eed6d772
  姜海波 committed Mar 20, 2020
  
  eed6d772 Browse Files
- 满额减配送费 · b9cd30a5
  姜海波 committed Mar 20, 2020
  
  b9cd30a5 Browse Files
- 满额减配送费 · 615d2753
  姜海波 committed Mar 20, 2020
  
  615d2753 Browse Files
- 修改receiveId判断 · 342b8534
  姜海波 committed Mar 20, 2020
  
  342b8534 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
- 合并最新master分支 · 36e664b4
  姜海波 committed Mar 20, 2020
  
  36e664b4 Browse Files