Commits · b828373ba19324a4ce2fbb419b959d8d7d2f374b · order-group-application / order-group · GitLab

16 Aug, 2020 5 commits
- Merge remote-tracking branch 'remotes/origin/feature/1.9.32_商品加料' into qa · b828373b
```
# Conflicts:
#	assortment-shoppingcart-sdk/pom.xml
#	shopping-cart-application-service/pom.xml
```
  xiaoer.li@freemud.com committed Aug 16, 2020
  b828373b Browse Files
- 小料信息有异常直接从购物车中异常及提示 · 0bd8bba3
  xiaoer.li@freemud.com committed Aug 16, 2020
  
  0bd8bba3 Browse Files
- Merge remote-tracking branch 'remotes/origin/feature/1.9.32_商品加料' into qa · 82870ca4
  xiaoer.li@freemud.com committed Aug 16, 2020
  
  82870ca4 Browse Files
- fix · d35e7312
  xiaoer.li@freemud.com committed Aug 16, 2020
  
  d35e7312 Browse Files
- Merge branch 'qa' of http://gitlab.freemud.com/order-group-application/order-group into qa · a8acc195
  xiaoer.li@freemud.com committed Aug 16, 2020
  
  a8acc195 Browse Files
15 Aug, 2020 4 commits
- 升级购物车sdk 快照 · ff3124a6
  xiaoer.li committed Aug 15, 2020
  
  ff3124a6 Browse Files
- Merge remote-tracking branch 'remotes/origin/feature/1.9.32_商品加料' into qa · 61b4e475
```
# Conflicts:
#	shopping-cart-application-service/pom.xml
```
  xiaoer.li committed Aug 15, 2020
  61b4e475 Browse Files
- 增加小料商品变化异常校验 · 8b79abd5
  xiaoer.li committed Aug 15, 2020
  
  8b79abd5 Browse Files
- 将小料异常标识在行记录上 · a5e0238b
  xiaoer.li committed Aug 15, 2020
  
  a5e0238b Browse Files
14 Aug, 2020 24 commits
- Merge remote-tracking branch 'remotes/origin/feature/1.9.32_商品加料' into qa · 2636298a
  xiaoer.li@freemud.com committed Aug 14, 2020
  
  2636298a Browse Files
- 去掉小料金额累加到主商品上 · 1c4d5058
  xiaoer.li@freemud.com committed Aug 14, 2020
  
  1c4d5058 Browse Files
- 多活动信息填充 · 02ba30fb
  xiaoer.li@freemud.com committed Aug 14, 2020
  
  02ba30fb Browse Files
- Merge remote-tracking branch 'origin/qa' into qa · 2478d951
  xiaoer.li@freemud.com committed Aug 14, 2020
  
  2478d951 Browse Files
- Merge remote-tracking branch 'remotes/origin/feature/1.9.32_商品加料' into qa · 0121166b
  xiaoer.li@freemud.com committed Aug 14, 2020
  
  0121166b Browse Files
- 小料价格计入主商品 · fb777dd5
  xiaoer.li@freemud.com committed Aug 14, 2020
  
  fb777dd5 Browse Files
- Merge branch 'feature/1.9.32-加料商品开发' into qa · d7baeb52
  chongfu.liang committed Aug 14, 2020
  
  d7baeb52 Browse Files
- 加料价格修改 · a89e2cea
  chongfu.liang committed Aug 14, 2020
  
  a89e2cea Browse Files
- Merge remote-tracking branch 'remotes/origin/feature/1.9.32_商品加料' into qa · d940d419
  xiaoer.li@freemud.com committed Aug 14, 2020
  
  d940d419 Browse Files
- 代金券增加小料数量 · 9cb38155
  xiaoer.li@freemud.com committed Aug 14, 2020
  
  9cb38155 Browse Files
- Merge remote-tracking branch 'remotes/origin/feature/1.9.32_商品加料' into qa · ae5c54ef
  xiaoer.li@freemud.com committed Aug 14, 2020
  
  ae5c54ef Browse Files
- 代金券增加小料金额 · 9d16dd1b
  xiaoer.li@freemud.com committed Aug 14, 2020
  
  9d16dd1b Browse Files
- Merge remote-tracking branch 'remotes/origin/feature/1.9.32_商品加料' into qa · ea00187b
  xiaoer.li@freemud.com committed Aug 14, 2020
  
  ea00187b Browse Files
- 代金券增加小料金额 · 216bdeae
  xiaoer.li@freemud.com committed Aug 14, 2020
  
  216bdeae Browse Files
- Merge remote-tracking branch 'origin/qa' into qa · 90e86b9f
  xiaoer.li@freemud.com committed Aug 14, 2020
  
  90e86b9f Browse Files
- qa 购物车sdk · cdbca98e
  xiaoer.li@freemud.com committed Aug 14, 2020
  
  cdbca98e Browse Files
- Merge remote-tracking branch 'remotes/origin/feature/1.9.32_商品加料' into qa · 4eb68c6e
  xiaoer.li@freemud.com committed Aug 14, 2020
  
  4eb68c6e Browse Files
- 代金券增加小料金额 · 4b045e8b
  xiaoer.li@freemud.com committed Aug 14, 2020
  
  4b045e8b Browse Files
- Merge remote-tracking branch… · 6da4bb30
```
Merge remote-tracking branch 'remotes/origin/feature/1.9.29_修复发券时指定门店引起的结算页展示非适用门店券问题' into feature/1.9.32_商品加料
```
  xiaoer.li@freemud.com committed Aug 14, 2020
  6da4bb30 Browse Files
- Merge branch 'feature/1.9.32-加料商品开发' into qa · 6352464b
  chongfu.liang committed Aug 14, 2020
  
  6352464b Browse Files
- 加料开发 · 8424e706
  chongfu.liang committed Aug 14, 2020
  
  8424e706 Browse Files
- 升级SDK · 81bf34f6
  chongfu.liang committed Aug 14, 2020
  
  81bf34f6 Browse Files
- Merge branch 'feature/1.9.32-加料商品开发' into qa · 261d6531
  chongfu.liang committed Aug 14, 2020
  
  261d6531 Browse Files
- 加料商品开发 · f0e248a7
  chongfu.liang committed Aug 14, 2020
  
  f0e248a7 Browse Files
13 Aug, 2020 7 commits
- 更改qa环境apollo配置 · f86c5fe7
  shuhu.hou@freemud.cn committed Aug 13, 2020
  
  f86c5fe7 Browse Files
- Merge remote-tracking branch 'origin/qa' into qa · 1ec67142
  shuhu.hou@freemud.cn committed Aug 13, 2020
  
  1ec67142 Browse Files
- 配送回调调试 · d78b6264
  shuhu.hou@freemud.cn committed Aug 13, 2020
  
  d78b6264 Browse Files
- Merge remote-tracking branch 'remotes/origin/feature/1.9.32_商品加料' into qa · 7fa6dfab
  xiaoer.li@freemud.com committed Aug 13, 2020
  
  7fa6dfab Browse Files
- fix pk · 26099349
  xiaoer.li@freemud.com committed Aug 13, 2020
  
  26099349 Browse Files
- Merge branch 'feature/2020/08/06-1.9.34-劵锁定与解锁-张志恒' into qa · d0e97aa7
```
# Conflicts:
#	assortment-ordercenter-sdk/pom.xml
#	order-application-service/pom.xml
```
  zhiheng.zhang committed Aug 13, 2020
  d0e97aa7 Browse Files
- Merge remote-tracking branch 'origin/qa' into qa · 0ca3a6a6
  zhiheng.zhang committed Aug 13, 2020
  
  0ca3a6a6 Browse Files