Commits · df49371c1d620e16ef0219e2b3cddd37ea512c7e · jenkins / order-group

31 Mar, 2020 6 commits
- Merge branch 'feature/20200324_套餐商品组校验' into qa · df49371c
  shuhu.hou@freemud.cn committed Mar 31, 2020
  
  df49371c Browse Files
- productGroupId由Long转String类型 · 7e724c4b
  shuhu.hou@freemud.cn committed Mar 31, 2020
  
  7e724c4b Browse Files
- Merge branch 'feature/20200324_套餐商品组校验' into qa · b3ee3b9b
  shuhu.hou@freemud.cn committed Mar 31, 2020
  
  b3ee3b9b Browse Files
- productGroupId由Long转String类型 · c0600594
  shuhu.hou@freemud.cn committed Mar 31, 2020
  
  c0600594 Browse Files
- Merge branch 'feature/20200324_套餐商品组校验' into qa · e4aa8d08
```
# Conflicts:
#	assortment-shoppingcart-sdk/pom.xml
#	shopping-cart-application-service/pom.xml
```
  shuhu.hou@freemud.cn committed Mar 31, 2020
  e4aa8d08 Browse Files
- productGroupId由Long转String类型 · 8d2eb20f
  shuhu.hou@freemud.cn committed Mar 31, 2020
  
  8d2eb20f Browse Files
30 Mar, 2020 5 commits
- 忽略iml文件 · db36af1e
  shuhu.hou@freemud.cn committed Mar 30, 2020
  
  db36af1e Browse Files
- 升级sdk · 437a4cd9
  dingkai committed Mar 30, 2020
  
  437a4cd9 Browse Files
- 修复即时单和预约单不返还打包费 · 58a87836
  shuhu.hou@freemud.cn committed Mar 30, 2020
  
  58a87836 Browse Files
- Merge branch 'feature/20200330_结算页配送费' into qa · 20b7d2a7
```
# Conflicts:
#	order-application-service/pom.xml
#	shopping-cart-application-service/src/main/java/cn/freemud/constant/ApplicationConstant.java
#	shopping-cart-application-service/src/main/java/cn/freemud/service/impl/ShoppingCartNewServiceImpl.java
```
  shuhu.hou@freemud.cn committed Mar 30, 2020
  20b7d2a7 Browse Files
- 修复即时单和预约单不返还打包费 · be871695
  shuhu.hou@freemud.cn committed Mar 30, 2020
  
  be871695 Browse Files
28 Mar, 2020 2 commits
- 调整 · 17839b2d
  姜海波 committed Mar 28, 2020
  
  17839b2d Browse Files
- 测试注册 · 5451e4b1
  姜海波 committed Mar 28, 2020
  
  5451e4b1 Browse Files
27 Mar, 2020 5 commits
- 测试注册 · 9da4a3c4
  姜海波 committed Mar 27, 2020
  
  9da4a3c4 Browse Files
- Merge branch 'feature/1.9.17-Exception-20200325-dingkai' into qa · 924bedaa
  dingkai committed Mar 27, 2020
  
  924bedaa Browse Files
- 升级sdk · 9d7c9428
  dingkai committed Mar 27, 2020
  
  9d7c9428 Browse Files
- 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 22 commits
- 调整浮点 · a245b697
  姜海波 committed Mar 26, 2020
  
  a245b697 Browse Files
- 调整浮点 · 364550d2
  姜海波 committed Mar 26, 2020
  
  364550d2 Browse Files
- 调整浮点 · dc8c73cb
  姜海波 committed Mar 26, 2020
  
  dc8c73cb 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 · 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 · 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 · 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 · 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 · 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 · 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 · 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 · 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 · 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