Commits · 15b75da76c79618ab29be09a30dfd2eb24dd32ab · jenkins / order-group · GitLab

31 Mar, 2020 10 commits
- Merge branch 'master' of http://gitlab.freemud.com/order-group-application/order-group · 15b75da7
  姜海波 committed Mar 31, 2020
  
  15b75da7 Browse Files
- 去掉普罗米修斯 · 103ea542
  姜海波 committed Mar 31, 2020
  
  103ea542 Browse Files
- Merge branch 'master' of http://gitlab.freemud.com/order-group-application/order-group · 5d8aa010
  姜海波 committed Mar 31, 2020
  
  5d8aa010 Browse Files
- 修正配置 · b135cf2f
  姜海波 committed Mar 31, 2020
  
  b135cf2f Browse Files
- Merge branch 'master' of http://gitlab.freemud.com/order-group-application/order-group · 7aafa2d0
  yong.huang committed Mar 31, 2020
  
  7aafa2d0 Browse Files
- 增加健康检测接口 · cb704f96
  yong.huang committed Mar 31, 2020
  
  cb704f96 Browse Files
- 增加健康检测接口 · d483e439
  yong.huang committed Mar 31, 2020
  
  d483e439 Browse Files
- 修改eureka 注册名 · 01d2586a
  姜海波 committed Mar 31, 2020
  
  01d2586a Browse Files
- 修改注册eureka的配置 · 5a1c8c37
  张明警 committed Mar 31, 2020
  
  5a1c8c37 Browse Files
- Merge remote-tracking branch 'remotes/origin/feature-2020/3/30-1.9.17-prometheus二期-海波' · be3e1b60
  姜海波 committed Mar 31, 2020
  
  be3e1b60 Browse Files
30 Mar, 2020 8 commits
- 忽略iml文件 · deafb006
  shuhu.hou@freemud.cn committed Mar 30, 2020
  
  deafb006 Browse Files
- 普罗米修斯 · 6cf81dde
  姜海波 committed Mar 30, 2020
  
  6cf81dde Browse Files
- 普罗米修斯 · f2b8142f
  姜海波 committed Mar 30, 2020
  
  f2b8142f Browse Files
- 普罗米修斯 · adffc70b
  姜海波 committed Mar 30, 2020
  
  adffc70b Browse Files
- 添加版本号 · 257b439b
  姜海波 committed Mar 30, 2020
  
  257b439b Browse Files
- 添加版本号 · fb033648
  姜海波 committed Mar 30, 2020
  
  fb033648 Browse Files
- 配送费 · 51246a26
  姜海波 committed Mar 30, 2020
  
  51246a26 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 2 commits
- 调整配送费小数点 · 2ca0bb30
  姜海波 committed Mar 25, 2020
  
  2ca0bb30 Browse Files
- 调整配送费逻辑 · bc969aca
  姜海波 committed Mar 25, 2020
  
  bc969aca Browse Files