Commits · 8c57992b6707aa02abb83b0f182a45420197406c · jenkins / order-group

11 Feb, 2020 17 commits
- Merge remote-tracking branch 'remotes/origin/feature/1.9.11_goodsGroup' into qa · 8c57992b
```
# Conflicts:
#	assortment-ordercenter-sdk/pom.xml
#	assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/adapter/OrderSdkAdapter.java
#	order-application-service/pom.xml
```
  huvchao@126.com committed Feb 11, 2020
  8c57992b Browse Files
- 套餐商品保存商品组信息 · 21428b30
  huvchao@126.com committed Feb 11, 2020
  
  21428b30 Browse Files
- 套餐商品商品组 · c1dc318f
  huvchao@126.com committed Feb 11, 2020
  
  c1dc318f Browse Files
- Merge branch 'feature/1.9.10-购物车接口修改渠道字段-海波' into develop · d8b2fc24
  shuhu.hou committed Feb 11, 2020
  
  d8b2fc24 Browse Files
- 扣减库存传入订单号 · 2e1a8cb9
  shuhu.hou committed Feb 11, 2020
  
  2e1a8cb9 Browse Files
- Merge branch 'feature/1.9.10-购物车接口修改渠道字段-海波' into develop · 8662132a
  shuhu.hou committed Feb 11, 2020
  
  8662132a Browse Files
- menuType-fixbug · fd454bd0
  shuhu.hou committed Feb 11, 2020
  
  fd454bd0 Browse Files
- 合并分支 · 6ee3845a
  shuhu.hou committed Feb 11, 2020
  
  6ee3845a Browse Files
- 合并分支 · da645e63
  shuhu.hou committed Feb 11, 2020
  
  da645e63 Browse Files
- Merge branch 'feature/1.9.10-购物车接口修改渠道字段-海波' into develop · 47cb9077
```
# Conflicts:
#	assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/request/order/BaseCreateOrderRequest.java
#	assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/service/order/OrderCenterSdkServiceImpl.java
#	shopping-cart-application-service/src/main/java/cn/freemud/service/impl/ShoppingCartNewServiceImpl.java
```
  shuhu.hou committed Feb 11, 2020
  47cb9077 Browse Files
- 升级sdk · 29eb8dc7
  dingkai committed Feb 11, 2020
  
  29eb8dc7 Browse Files
- Merge branch 'feature/1.9.12-dingkai' into develop · 71af5c4b
  dingkai committed Feb 11, 2020
  
  71af5c4b Browse Files
- 渠道名称 · d0e7ec5c
  dingkai committed Feb 11, 2020
  
  d0e7ec5c Browse Files
- Merge branch 'feature/20200210_微信支付上传' into develop · 3a56674c
  shuhu.hou committed Feb 11, 2020
  
  3a56674c Browse Files
- 微信支付上传 · 7952ca86
  shuhu.hou committed Feb 11, 2020
  
  7952ca86 Browse Files
- Merge branch 'feature/1.9.12-dingkai' into develop · e74519a7
  dingkai committed Feb 11, 2020
  
  e74519a7 Browse Files
- 构建生成源码 · 883c1200
  dingkai committed Feb 11, 2020
  
  883c1200 Browse Files
10 Feb, 2020 3 commits
- 合并代码 · 7f31218b
  shuhu.hou committed Feb 10, 2020
  
  7f31218b Browse Files
- Merge branch 'feature/20200205_券码核销改造' into develop · d886d889
```
# Conflicts:
#	assortment-ordercenter-sdk/pom.xml
#	order-application-service/pom.xml
```
  shuhu.hou committed Feb 10, 2020
  d886d889 Browse Files
- 升级券码sdk,传参添加app_flag · d8deeacd
  shuhu.hou committed Feb 10, 2020
  
  d8deeacd Browse Files
07 Feb, 2020 1 commit
- 升级券码sdk,传参添加app_flag · 8549cd17
  shuhu.hou committed Feb 07, 2020
  
  8549cd17 Browse Files
06 Feb, 2020 11 commits
- 合并master分支 · 6b000aca
  shuhu.hou committed Feb 06, 2020
  
  6b000aca Browse Files
- Merge branch 'master' into feature/1.9.10-购物车接口修改渠道字段-海波 · 99758371
```
# Conflicts:
#	assortment-shoppingcart-sdk/src/main/java/com/freemud/sdk/api/assortment/shoppingcart/request/CheckCartRequest.java
#	shopping-cart-application-service/src/main/java/cn/freemud/service/impl/AssortmentSdkService.java
#	shopping-cart-application-service/src/main/java/cn/freemud/service/impl/BuyAndGiftsPromotionService.java
#	shopping-cart-application-service/src/main/java/cn/freemud/service/impl/ShoppingCartNewServiceImpl.java
```
  shuhu.hou committed Feb 06, 2020
  99758371 Browse Files
- 创建订单新增menuType · 9092484d
  shuhu.hou committed Feb 06, 2020
  
  9092484d Browse Files
- menuType修改 · 8e2eda09
  姜海波 committed Feb 06, 2020
  
  8e2eda09 Browse Files
- menuType修改 · cd5b7f6a
  姜海波 committed Feb 06, 2020
  
  cd5b7f6a Browse Files
- Merge branch 'feature/1.9.11_goodsGroup' into develop · 741d8409
  huvchao@126.com committed Feb 06, 2020
  
  741d8409 Browse Files
- 支付成功移除卡包 · 14d629d7
  shuhu.hou committed Feb 06, 2020
  
  14d629d7 Browse Files
- assortment-ordercenter-sdk of 1.1.7 · 2db8e6a2
  huvchao@126.com committed Feb 06, 2020
  
  2db8e6a2 Browse Files
- 1.1.7 · 41625889
  胡超 committed Feb 06, 2020
  
  41625889 Browse Files
- Merge branch 'feature/1.9.11_goodsGroup' into develop · 50cfa3ab
```
# Conflicts:
#	assortment-ordercenter-sdk/pom.xml
#	assortment-ordercenter-sdk/readme.md
#	assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/adapter/OrderSdkAdapter.java
#	order-application-service/pom.xml
```
  胡超 committed Feb 06, 2020
  50cfa3ab Browse Files
- 核销券码失败，直接返回 · 4b62383d
  shuhu.hou@freemud.cn committed Feb 06, 2020
  
  4b62383d Browse Files
05 Feb, 2020 2 commits
- 商品组 · 9fc28325
  huvchao@126.com committed Feb 05, 2020
  
  9fc28325 Browse Files
- 商品组 · e078b7f9
  huvchao@126.com committed Feb 05, 2020
  
  e078b7f9 Browse Files
18 Jan, 2020 6 commits
- Merge branch 'feature/20200117_核销券失败退款兼容' · 9029c5e9
  shuhu.hou@freemud.cn committed Jan 18, 2020
  
  9029c5e9 Browse Files
- Merge branch 'feature/20200117_核销券失败退款兼容' into develop · 70445702
  shuhu.hou@freemud.cn committed Jan 18, 2020
  
  70445702 Browse Files
- 核销券码失败，直接返回 · 28f4d5e1
  shuhu.hou@freemud.cn committed Jan 18, 2020
  
  28f4d5e1 Browse Files
- 添加性别字段 - 升级sdk · 194b0d33
  张明警 committed Jan 18, 2020
  
  194b0d33 Browse Files
- Merge branches 'develop' and 'feature/1.9.11-明警' of… · 97369031
```
Merge branches 'develop' and 'feature/1.9.11-明警' of gitlab.freemud.com:order-group-application/order-group into develop
```
  张明警 committed Jan 18, 2020
  97369031 Browse Files
- 添加性别字段 · e3d7948a
  张明警 committed Jan 18, 2020
  
  e3d7948a Browse Files