Commits · 3d995e68e7c40fa5ef68434fc72629a1fc21fcaa · order-group-application / order-group · GitLab

27 Nov, 2020 7 commits
- Merge branch 'feature/20201124_xukang_麦咖啡p3v3' into qa · 3d995e68
  徐康 committed Nov 27, 2020
  
  3d995e68 Browse Files
- Merge remote-tracking branch 'origin/qa' into qa · b16d71ed
  刘鹏飞 committed Nov 27, 2020
  
  b16d71ed Browse Files
- Merge remote-tracking branch 'remotes/origin/feature/coco-payGift-刘鹏飞' into qa · c43493b8
```
# Conflicts:
#	order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java
#	shopping-cart-application-service/src/main/java/cn/freemud/entities/vo/ShoppingCartGoodsResponseVo.java
#	shopping-cart-application-service/src/main/java/cn/freemud/service/impl/ShoppingCartNewServiceImpl.java
```
  刘鹏飞 committed Nov 27, 2020
  c43493b8 Browse Files
- Merge branch 'feature/20201125_多规格商品下添加单规格商品_yu.sun' into qa · e175e832
  孙昱 committed Nov 27, 2020
  
  e175e832 Browse Files
- Merge branch 'feature/20201125_多规格商品下添加单规格商品_yu.sun' of… · 4255614d
```
Merge branch 'feature/20201125_多规格商品下添加单规格商品_yu.sun' of gitlab.freemud.com:order-group-application/order-group into feature/20201125_多规格商品下添加单规格商品_yu.sun
```
  孙昱 committed Nov 27, 2020
  4255614d Browse Files
- sunyu::update::fix bug about delivery-fee payment · 27f9b6f0
  孙昱 committed Nov 27, 2020
  
  27f9b6f0 Browse Files
- PayVoucher可能为空 · 01e3fa51
  徐康 committed Nov 27, 2020
  
  01e3fa51 Browse Files
26 Nov, 2020 33 commits
- Merge branch 'feature/20201125_多规格商品下添加单规格商品_yu.sun' into qa · 7d6d96b9
  yu.sun committed Nov 27, 2020
  
  7d6d96b9 Browse Files
- sunyu::update::fix bug about material about originPrice · 51c1df6a
  yu.sun committed Nov 26, 2020
  
  51c1df6a Browse Files
- Merge remote-tracking branch 'origin/qa' into qa · 07fb68ac
  xiaoer.li@freemud.com committed Nov 26, 2020
  
  07fb68ac Browse Files
- Merge branch 'feature/new-fixbig' into qa · 9bb7057b
  xiaoer.li@freemud.com committed Nov 26, 2020
  
  9bb7057b Browse Files
- 购物车查询增加买一赠一寄杯活动 · f33d6f7e
  刘鹏飞 committed Nov 26, 2020
  
  f33d6f7e Browse Files
- 删除不符合条件的套餐 · 3a00db69
  xiaoer.li@freemud.com committed Nov 26, 2020
  
  3a00db69 Browse Files
- Merge branch 'feature/20201119-mixue-zhw' of… · cf3a5503
```
Merge branch 'feature/20201119-mixue-zhw' of gitlab.freemud.com:order-group-application/order-group into qa
```
  张洪旺 committed Nov 26, 2020
  cf3a5503 Browse Files
- fix var1.setCreateEvent(4); · 69795c3b
  张洪旺 committed Nov 26, 2020
  
  69795c3b Browse Files
- Merge remote-tracking branch 'origin/qa' into qa · 8c80dd19
  yu.sun committed Nov 26, 2020
  
  8c80dd19 Browse Files
- Merge branch 'feature/20201125_多规格商品下添加单规格商品_yu.sun' into qa · 19144c52
  yu.sun committed Nov 26, 2020
  
  19144c52 Browse Files
- sunyu::fixbug::fix bug about material · f07cd9f5
  yu.sun committed Nov 26, 2020
  
  f07cd9f5 Browse Files
- sdk · 7d469fd1
  xiaoer.li@freemud.com committed Nov 26, 2020
  
  7d469fd1 Browse Files
- Merge branch 'feature/new-fixbig' into qa · 532f8498
  xiaoer.li@freemud.com committed Nov 26, 2020
  
  532f8498 Browse Files
- 套餐商品增加商品类型 · 472253db
  xiaoer.li@freemud.com committed Nov 26, 2020
  
  472253db Browse Files
- Merge branch 'feature/2020-1104-混合支付' into qa · b70a92e4
  xiaoer.li@freemud.com committed Nov 26, 2020
  
  b70a92e4 Browse Files
- fix · 80914e08
  xiaoer.li@freemud.com committed Nov 26, 2020
  
  80914e08 Browse Files
- Merge branch 'feature/2020-1104-混合支付' into qa · cac3048e
  xiaoer.li@freemud.com committed Nov 26, 2020
  
  cac3048e Browse Files
- fix · a9b49734
  xiaoer.li@freemud.com committed Nov 26, 2020
  
  a9b49734 Browse Files
- Merge remote-tracking branch 'origin/qa' into qa · 788dd9a0
  xiaoer.li@freemud.com committed Nov 26, 2020
  
  788dd9a0 Browse Files
- Merge branch 'feature/new-fixbig' into qa · 1ca427ae
  xiaoer.li@freemud.com committed Nov 26, 2020
  
  1ca427ae Browse Files
- Merge branch 'feature/2020-1104-混合支付' into qa · 2bb7fde0
  xiaoer.li@freemud.com committed Nov 26, 2020
  
  2bb7fde0 Browse Files
- fix · 40a5c97a
  xiaoer.li@freemud.com committed Nov 26, 2020
  
  40a5c97a Browse Files
- fix · 42c5e571
  xiaoer.li@freemud.com committed Nov 26, 2020
  
  42c5e571 Browse Files
- Merge branch 'feature/20201123-添加美团点评渠道' into qa · b6f24798
  chongfu.liang committed Nov 26, 2020
  
  b6f24798 Browse Files
- 添加美团点评智慧餐厅渠道 · e1423820
  chongfu.liang committed Nov 26, 2020
  
  e1423820 Browse Files
- Merge branch 'feature/20201119-mixue-zhw' of… · 874db97a
```
Merge branch 'feature/20201119-mixue-zhw' of gitlab.freemud.com:order-group-application/order-group into qa
```
  张洪旺 committed Nov 26, 2020
  874db97a Browse Files
- fix 取消未支付退款 · e149b220
  张洪旺 committed Nov 26, 2020
  
  e149b220 Browse Files
- Merge branch 'qa' of http://gitlab.freemud.com/order-group-application/order-group into qa · b3680fbf
```
 Conflicts:
	order-application-service/src/main/java/cn/freemud/adapter/OrderAdapter.java
```
  xiaoer.li@freemud.com committed Nov 26, 2020
  b3680fbf Browse Files
- Merge branch 'feature/2020-1104-混合支付' into qa · 6ae3b28e
  xiaoer.li@freemud.com committed Nov 26, 2020
  
  6ae3b28e Browse Files
- fix · ad92be70
  xiaoer.li@freemud.com committed Nov 26, 2020
  
  ad92be70 Browse Files
- Merge remote-tracking branch 'origin/qa' into qa · 79dadbeb
  徐康 committed Nov 26, 2020
  
  79dadbeb Browse Files
- 判断非空 · ddebe670
  徐康 committed Nov 26, 2020
  
  ddebe670 Browse Files
- Merge branch 'qa' of http://gitlab.freemud.com/order-group-application/order-group into qa · 4fdd271a
  xiaoer.li@freemud.com committed Nov 26, 2020
  
  4fdd271a Browse Files