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

29 Oct, 2020 40 commits
- Merge branch 'feature-yu.sun-material-20201030' into qa · bcb746b3
  yu.sun committed Oct 30, 2020
  
  bcb746b3 Browse Files
- sunyu::fix::fix about clear deliveryAmount · 2567effe
  yu.sun committed Oct 30, 2020
  
  2567effe Browse Files
- Merge branch 'feature-yu.sun-material-20201030' into qa · cca466f8
  yu.sun committed Oct 30, 2020
  
  cca466f8 Browse Files
- Merge branch 'feature-yu.sun-material-20201030' of… · 96f501c2
```
Merge branch 'feature-yu.sun-material-20201030' of gitlab.freemud.com:order-group-application/order-group into feature-yu.sun-material-20201030
```
  yu.sun committed Oct 30, 2020
  96f501c2 Browse Files
- sunyu::fix::fix bug about SETMEAL_PRODUCT originalPrice sum · f84358b9
  yu.sun committed Oct 30, 2020
  
  f84358b9 Browse Files
- sdk同步 · 036c41c6
  ping.wu committed Oct 29, 2020
  
  036c41c6 Browse Files
- Merge branches 'feature-yu.sun-material-20201030' and 'qa' of… · 8a129acd
```
Merge branches 'feature-yu.sun-material-20201030' and 'qa' of http://gitlab.freemud.com/order-group-application/order-group into qa
```
  ping.wu committed Oct 29, 2020
  8a129acd Browse Files
- 促销计算加料商品spuid非空 · 29d993da
  ping.wu committed Oct 29, 2020
  
  29d993da Browse Files
- 套餐可选商品spuid赋值 · c01ca5dd
  ping.wu committed Oct 29, 2020
  
  c01ca5dd Browse Files
- sunyu::update::fix bug about specialAttribute copyOrder · e2165787
  yu.sun committed Oct 29, 2020
  
  e2165787 Browse Files
- sunyu::update::fix bug about specialAttribute copyOrder · 3b306630
  yu.sun committed Oct 29, 2020
  
  3b306630 Browse Files
- sunyu::update::fix bug about specialAttribute copyOrder · bbdf752d
  yu.sun committed Oct 29, 2020
  
  bbdf752d Browse Files
- sunyu::update::fix bug about specialAttribute copyOrder · 8eb4085f
  yu.sun committed Oct 29, 2020
  
  8eb4085f Browse Files
- Merge branch 'feature-yu.sun-material-20201030' of… · 13a1533f
```
Merge branch 'feature-yu.sun-material-20201030' of gitlab.freemud.com:order-group-application/order-group into feature-yu.sun-material-20201030
```
  yu.sun committed Oct 29, 2020
  13a1533f Browse Files
- sunyu::update::fix bug about specialAttribute copyOrder · d4acd63c
  yu.sun committed Oct 29, 2020
  
  d4acd63c Browse Files
- Merge branch 'qa' of gitlab.freemud.com:order-group-application/order-group into qa · 0aa176cf
  yu.sun committed Oct 29, 2020
  
  0aa176cf Browse Files
- sunyu::update::fix bug about specialAttribute copyOrder · 1e589a0f
  yu.sun committed Oct 29, 2020
  
  1e589a0f Browse Files
- Merge branch 'feature/20200915_麦咖啡p2v3活动入机增加TENDERID字段' into feature-yu.sun-material-20201030 · 37088832
  徐康 committed Oct 29, 2020
  
  37088832 Browse Files
- Merge branch 'feature/20201022_入机键位修改_xukang' into feature-yu.sun-material-20201030 · a0b17af8
```
# Conflicts:
#	shopping-cart-application-service/src/main/java/cn/freemud/service/impl/mcoffee/ShoppingCartMCoffeeServiceImpl.java
```
  徐康 committed Oct 29, 2020
  a0b17af8 Browse Files
- Merge branch 'feature/20201021_万能券展示问题_xukang' into feature-yu.sun-material-20201030 · afccfb84
  徐康 committed Oct 29, 2020
  
  afccfb84 Browse Files
- Merge branches 'feature-yu.sun-material-20201030' and 'qa' of… · 5f1bd824
```
Merge branches 'feature-yu.sun-material-20201030' and 'qa' of http://gitlab.freemud.com/order-group-application/order-group into qa
```
  ping.wu committed Oct 29, 2020
  5f1bd824 Browse Files
- Merge remote-tracking branch 'origin/feature-yu.sun-material-20201030' into… · 9db8c113
```
Merge remote-tracking branch 'origin/feature-yu.sun-material-20201030' into feature-yu.sun-material-20201030
```
  ping.wu committed Oct 29, 2020
  9db8c113 Browse Files
- 商品行总价修改 · b53aa9a3
  ping.wu committed Oct 29, 2020
  
  b53aa9a3 Browse Files
- Merge branch 'feature-yu.sun-material-20201030' into qa · 5ab3f7a2
  yu.sun committed Oct 29, 2020
  
  5ab3f7a2 Browse Files
- Merge branch 'feature-yu.sun-material-20201030' of… · ba4c77a2
```
Merge branch 'feature-yu.sun-material-20201030' of gitlab.freemud.com:order-group-application/order-group into feature-yu.sun-material-20201030
```
  yu.sun committed Oct 29, 2020
  ba4c77a2 Browse Files
- sunyu::update::fix bug about specialAttribute copyOrder · e619417d
  yu.sun committed Oct 29, 2020
  
  e619417d Browse Files
- Merge branch 'feature/20200915_麦咖啡p2v3活动入机增加TENDERID字段' into qa · bb1cd8e4
  徐康 committed Oct 29, 2020
  
  bb1cd8e4 Browse Files
- 特制属性 · 9d26c074
  徐康 committed Oct 29, 2020
  
  9d26c074 Browse Files
- Merge remote-tracking branch 'origin/qa' into qa · 0b735eeb
  chongfu.liang committed Oct 29, 2020
  
  0b735eeb Browse Files
- Merge branch 'feature/2.0.4-修改支持的订单类型' into qa · c97f7215
  chongfu.liang committed Oct 29, 2020
  
  c97f7215 Browse Files
- 创建配送单支持类型改造 · e877927c
  chongfu.liang committed Oct 29, 2020
  
  e877927c Browse Files
- Merge remote-tracking branch 'origin/qa' into qa · 470493ee
  徐康 committed Oct 29, 2020
  
  470493ee Browse Files
- 升级sdk · fff2fad6
  徐康 committed Oct 29, 2020
  
  fff2fad6 Browse Files
- Merge branches 'feature-yu.sun-material-20201030' and 'qa' of… · 5a088841
```
Merge branches 'feature-yu.sun-material-20201030' and 'qa' of http://gitlab.freemud.com/order-group-application/order-group into qa
```
  ping.wu committed Oct 29, 2020
  5a088841 Browse Files
- 套餐子商品spuid取值修改 · 97e7ff03
  ping.wu committed Oct 29, 2020
  
  97e7ff03 Browse Files
- Merge branch 'feature/20200915_麦咖啡p2v3活动入机增加TENDERID字段' into qa · 9a3a368d
  徐康 committed Oct 29, 2020
  
  9a3a368d Browse Files
- 加料商品顺序 · ea0a418d
  徐康 committed Oct 29, 2020
  
  ea0a418d Browse Files
- Merge branch 'feature/20200915_麦咖啡p2v3活动入机增加TENDERID字段' into qa · ef338f82
  徐康 committed Oct 29, 2020
  
  ef338f82 Browse Files
- 加料价格 · c3ab1e95
  徐康 committed Oct 29, 2020
  
  c3ab1e95 Browse Files
- Merge remote-tracking branch 'origin/qa' into qa · 49aa6e82
  徐康 committed Oct 29, 2020
  
  49aa6e82 Browse Files