Commits · 96f501c2f543ce4b8bc56cc31c37707bcfb0ba5c · order-group-application / order-group

29 Oct, 2020 25 commits
- 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
- 促销计算加料商品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 · 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
- 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 '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 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' 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
- 特制属性 · 9d26c074
  徐康 committed Oct 29, 2020
  
  9d26c074 Browse Files
- 套餐子商品spuid取值修改 · 97e7ff03
  ping.wu committed Oct 29, 2020
  
  97e7ff03 Browse Files
- 加料商品顺序 · ea0a418d
  徐康 committed Oct 29, 2020
  
  ea0a418d Browse Files
- 加料价格 · c3ab1e95
  徐康 committed Oct 29, 2020
  
  c3ab1e95 Browse Files
- Merge remote-tracking branch 'origin/feature-yu.sun-material-20201030' into… · bc7b879d
```
Merge remote-tracking branch 'origin/feature-yu.sun-material-20201030' into feature-yu.sun-material-20201030
```
  ping.wu committed Oct 29, 2020
  bc7b879d Browse Files
- 套餐子商品spuid取值修改 · eca713f8
  ping.wu committed Oct 29, 2020
  
  eca713f8 Browse Files
- 餐道价格显示 · c4719198
  徐康 committed Oct 29, 2020
  
  c4719198 Browse Files
- 再来一单 · 0b7a5b69
  徐康 committed Oct 29, 2020
  
  0b7a5b69 Browse Files
- Merge remote-tracking branch 'origin/feature-yu.sun-material-20201030' into… · 1a89f938
```
Merge remote-tracking branch 'origin/feature-yu.sun-material-20201030' into feature-yu.sun-material-20201030
```
  徐康 committed Oct 29, 2020
  1a89f938 Browse Files
- 加料再来一单 · 6ca9d366
  徐康 committed Oct 29, 2020
  
  6ca9d366 Browse Files
28 Oct, 2020 7 commits
- 套餐子商品价格取FinalPrice · d4e0f803
  ping.wu committed Oct 28, 2020
  
  d4e0f803 Browse Files
- 啡常月享卡 · 125b619c
  徐康 committed Oct 28, 2020
  
  125b619c Browse Files
- 报错修改 · c3f670e6
  ping.wu committed Oct 28, 2020
  
  c3f670e6 Browse Files
- 啡常月享卡 · 4d439421
  徐康 committed Oct 28, 2020
  
  4d439421 Browse Files
- Merge remote-tracking branch 'origin/feature-yu.sun-material-20201030' into… · 3ae88433
```
Merge remote-tracking branch 'origin/feature-yu.sun-material-20201030' into feature-yu.sun-material-20201030
```
  ping.wu committed Oct 28, 2020
  3ae88433 Browse Files
- 麦咖啡加料价格 · 8094ee88
  ping.wu committed Oct 28, 2020
  
  8094ee88 Browse Files
- 加料再来一单 · 88cab690
  徐康 committed Oct 28, 2020
  
  88cab690 Browse Files
27 Oct, 2020 2 commits
- 麦咖啡查询订单 · 16dfad36
  徐康 committed Oct 27, 2020
  
  16dfad36 Browse Files
- 麦咖啡多规格加料 · 068385c7
  ping.wu committed Oct 27, 2020
  
  068385c7 Browse Files
26 Oct, 2020 3 commits
- 麦咖啡多规格加料 · cc9be1ca
  ping.wu committed Oct 26, 2020
  
  cc9be1ca Browse Files
- 加料 · cc96f90e
  徐康 committed Oct 26, 2020
  
  cc96f90e Browse Files
- 加料商品详情 · 0cd035a0
  徐康 committed Oct 26, 2020
  
  0cd035a0 Browse Files
23 Oct, 2020 3 commits
- 加料键位字段修改 · 9073d88e
  ping.wu committed Oct 23, 2020
  
  9073d88e Browse Files
- 加料键位字段修改 · 4706aaa7
  ping.wu committed Oct 23, 2020
  
  4706aaa7 Browse Files
- 加料键位字段修改 · 6493ee45
  ping.wu committed Oct 23, 2020
  
  6493ee45 Browse Files