Commits · 1d7089a80c623d91da2e3456fa50a03e7e3dad9e · order-group-application / order-group · GitLab

15 Dec, 2020 40 commits
- Merge remote-tracking branch 'remotes/origin/feature/coco-payGift-刘鹏飞' into qa · 1d7089a8
  刘鹏飞 committed Dec 15, 2020
  
  1d7089a8 Browse Files
- coco订单详情展示的商品单价需要加上小料的价格 · e45c234f
  刘鹏飞 committed Dec 15, 2020
  
  e45c234f Browse Files
- Merge remote-tracking branch 'remotes/origin/feature/coco-payGift-刘鹏飞' into qa · c38b7950
  刘鹏飞 committed Dec 15, 2020
  
  c38b7950 Browse Files
- coco订单详情展示的商品单价需要加上小料的价格 · 33268a08
  刘鹏飞 committed Dec 15, 2020
  
  33268a08 Browse Files
- Merge remote-tracking branch 'remotes/origin/feature/coco-payGift-刘鹏飞' into qa · 2cdbc005
  刘鹏飞 committed Dec 15, 2020
  
  2cdbc005 Browse Files
- coco订单详情展示的商品单价需要加上小料的价格 · 340735c1
  刘鹏飞 committed Dec 15, 2020
  
  340735c1 Browse Files
- Merge remote-tracking branch 'remotes/origin/feature/coco-payGift-刘鹏飞' into qa · 6e1ff9fe
  刘鹏飞 committed Dec 15, 2020
  
  6e1ff9fe Browse Files
- coco小料价格问题 · e09a3b6e
  刘鹏飞 committed Dec 15, 2020
  
  e09a3b6e Browse Files
- Merge remote-tracking branch 'remotes/origin/feature/coco-payGift-刘鹏飞' into qa · 268780a0
  刘鹏飞 committed Dec 15, 2020
  
  268780a0 Browse Files
- coco小料价格问题 · f312d3bb
  刘鹏飞 committed Dec 15, 2020
  
  f312d3bb Browse Files
- Merge remote-tracking branch 'remotes/origin/feature/coco-payGift-刘鹏飞' into qa · a9f90e89
  刘鹏飞 committed Dec 15, 2020
  
  a9f90e89 Browse Files
- coco结算页商品现单价添加小料的计算 · febcb64c
  刘鹏飞 committed Dec 15, 2020
  
  febcb64c Browse Files
- Merge remote-tracking branch 'remotes/origin/feature/coco-payGift-刘鹏飞' into qa · c5773507
  刘鹏飞 committed Dec 15, 2020
  
  c5773507 Browse Files
- coco结算页商品现单价添加小料的计算 · 32b33b9f
  刘鹏飞 committed Dec 15, 2020
  
  32b33b9f Browse Files
- Merge remote-tracking branch 'remotes/origin/feature/coco-payGift-刘鹏飞' into qa · 95e44cc0
  刘鹏飞 committed Dec 15, 2020
  
  95e44cc0 Browse Files
- coco点餐页购物车行价格商品现单价不做二次编辑 · 0270a33f
  刘鹏飞 committed Dec 15, 2020
  
  0270a33f Browse Files
- coco点餐页购物车行价格商品现单价不做二次编辑 · 34cdb393
  刘鹏飞 committed Dec 15, 2020
  
  34cdb393 Browse Files
- Merge remote-tracking branch 'origin/qa' into qa · 522b4bd0
  徐康 committed Dec 15, 2020
  
  522b4bd0 Browse Files
- Merge remote-tracking branch 'remotes/origin/feature/coco-payGift-刘鹏飞' into qa · de685264
  刘鹏飞 committed Dec 15, 2020
  
  de685264 Browse Files
- 餐具商品 · 0ffabaf4
  徐康 committed Dec 15, 2020
  
  0ffabaf4 Browse Files
- Merge branch 'qa' of http://gitlab.freemud.com/order-group-application/order-group into qa · 23dd21b8
  缪晖 committed Dec 15, 2020
  
  23dd21b8 Browse Files
- QA分支json格式输出参数排查问题 · 0e575cb7
  缪晖 committed Dec 15, 2020
  
  0e575cb7 Browse Files
- Merge remote-tracking branch 'remotes/origin/feature/coco-payGift-刘鹏飞' into qa · 8fa515a6
  刘鹏飞 committed Dec 15, 2020
  
  8fa515a6 Browse Files
- coco点餐页购物车行价格商品现单价不做二次编辑 · a5ed495f
  刘鹏飞 committed Dec 15, 2020
  
  a5ed495f Browse Files
- Merge branch 'feature/20201202-商品券换购券商品添加可售时间校验' into qa · 32bfa7c1
```
# Conflicts:
#	shopping-cart-application-service/src/main/java/cn/freemud/service/impl/CouponServiceImpl.java
```
  chongfu.liang committed Dec 15, 2020
  32bfa7c1 Browse Files
- 校验 · 395eb5e4
  chongfu.liang committed Dec 15, 2020
  
  395eb5e4 Browse Files
- Merge remote-tracking branch 'remotes/origin/feature/coco-payGift-刘鹏飞' into qa · 108a6300
```
# Conflicts:
#	shopping-cart-application-service/src/main/java/cn/freemud/service/shoppingCart/impl/CocoShoppingCartRelationServiceImpl.java
```
  刘鹏飞 committed Dec 15, 2020
  108a6300 Browse Files
- coco加点日志 · 9d13cb3a
  刘鹏飞 committed Dec 15, 2020
  
  9d13cb3a Browse Files
- Merge branch 'feature/20201202-商品券换购券商品添加可售时间校验' into qa · ecd1e08c
  chongfu.liang committed Dec 15, 2020
  
  ecd1e08c Browse Files
- Merge remote-tracking branch 'origin/qa' into qa · 61d66592
  chongfu.liang committed Dec 15, 2020
  
  61d66592 Browse Files
- coco去掉报错行 · c7c0cb19
  刘鹏飞 committed Dec 15, 2020
  
  c7c0cb19 Browse Files
- 换购券 · a38c21b2
  chongfu.liang committed Dec 15, 2020
  
  a38c21b2 Browse Files
- Merge remote-tracking branch 'origin/qa' into qa · 158d8bc7
  刘鹏飞 committed Dec 15, 2020
  
  158d8bc7 Browse Files
- coco打点日志 · 94829f10
  刘鹏飞 committed Dec 15, 2020
  
  94829f10 Browse Files
- Merge branch 'feature/20201208_collageOrder_miaohui' into 'qa' · a2948ae1
```
goodsTag取值逻辑修正

See merge request !95
```
  缪晖 committed Dec 15, 2020
  a2948ae1 Browse Files
- Merge remote-tracking branch 'origin/qa' into qa · 870f063f
  徐康 committed Dec 15, 2020
  
  870f063f Browse Files
- 餐具商品 · a3c7ab32
  徐康 committed Dec 15, 2020
  
  a3c7ab32 Browse Files
- goodsTag取值逻辑修正 · f2896b45
  缪晖 committed Dec 15, 2020
  
  f2896b45 Browse Files
- Merge remote-tracking branch 'remotes/origin/feature/coco-payGift-刘鹏飞' into qa · e1236f50
  刘鹏飞 committed Dec 15, 2020
  
  e1236f50 Browse Files
- coco半价行小料半价显示判空 · 542b5009
  刘鹏飞 committed Dec 15, 2020
  
  542b5009 Browse Files