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

15 Dec, 2020 40 commits
- 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
- Merge branch 'feature/20201112_套餐价格计算_yu.sun' into qa · e31e158d
  孙昱 committed Dec 15, 2020
  
  e31e158d Browse Files
- sunyu::update::fix bug about combo-product price calculate · 7542198e
  孙昱 committed Dec 15, 2020
  
  7542198e Browse Files
- 判空 · 46187e73
  刘鹏飞 committed Dec 15, 2020
  
  46187e73 Browse Files
- QA环境促销问题定位调试 · 19fe05a4
  缪晖 committed Dec 15, 2020
  
  19fe05a4 Browse Files
- Merge remote-tracking branch 'remotes/origin/feature/coco-payGift-刘鹏飞' into qa · 1f4fdca9
  刘鹏飞 committed Dec 15, 2020
  
  1f4fdca9 Browse Files
- coco半价行小料半价显示 · 7cb91139
  刘鹏飞 committed Dec 15, 2020
  
  7cb91139 Browse Files
- Merge branch 'qa' of http://gitlab.freemud.com/order-group-application/order-group into qa · 6e555f40
  刘鹏飞 committed Dec 15, 2020
  
  6e555f40 Browse Files
- Merge remote-tracking branch 'remotes/origin/feature/coco-payGift-刘鹏飞' into qa · b26018b6
  刘鹏飞 committed Dec 15, 2020
  
  b26018b6 Browse Files
- coco半价行小料半价显示 · b33ad0f4
  刘鹏飞 committed Dec 15, 2020
  
  b33ad0f4 Browse Files
- 配送进程 · 185075a8
  邓杰 committed Dec 15, 2020
  
  185075a8 Browse Files
- Merge remote-tracking branch 'origin/qa' into qa · 09d94b9d
  徐康 committed Dec 15, 2020
  
  09d94b9d Browse Files
- 餐具商品日志 · 4e9885e7
  徐康 committed Dec 15, 2020
  
  4e9885e7 Browse Files
- Merge remote-tracking branch 'remotes/origin/feature/coco-payGift-刘鹏飞' into qa · 7d42bedb
  刘鹏飞 committed Dec 15, 2020
  
  7d42bedb Browse Files
- 打点日志 · e667eee5
  刘鹏飞 committed Dec 15, 2020
  
  e667eee5 Browse Files
- Merge remote-tracking branch 'remotes/origin/feature/coco-payGift-刘鹏飞' into qa · fe9dd566
  刘鹏飞 committed Dec 15, 2020
  
  fe9dd566 Browse Files
- coco商品原单价=商品现单价+小料现单价 · ba905d33
  刘鹏飞 committed Dec 15, 2020
  
  ba905d33 Browse Files
- Merge remote-tracking branch 'origin/qa' into qa · 7b87bd0e
  徐康 committed Dec 15, 2020
  
  7b87bd0e Browse Files
- 餐具商品 · 421dace4
  徐康 committed Dec 15, 2020
  
  421dace4 Browse Files
- Merge branch 'qa' of gitlab.freemud.com:order-group-application/order-group into qa · 77e3c8e8
  孙昱 committed Dec 15, 2020
  
  77e3c8e8 Browse Files
- Merge branch 'feature/20201210_可选商品加料需求_yu.sun' into qa · d290d46e
  孙昱 committed Dec 15, 2020
  
  d290d46e Browse Files
- sunyu::udpate::rollback · a10765ab
  孙昱 committed Dec 15, 2020
  
  a10765ab Browse Files
- Merge remote-tracking branch 'origin/qa' into qa · ebbdd4ab
  徐康 committed Dec 15, 2020
  
  ebbdd4ab Browse Files
- Merge branch 'feature/20201209_xukang_麦咖啡p4v2' into qa · def0a43b
  徐康 committed Dec 15, 2020
  
  def0a43b Browse Files
- 切换门店移除餐具商品 · bbd27e62
  徐康 committed Dec 15, 2020
  
  bbd27e62 Browse Files
- Merge remote-tracking branch 'remotes/origin/feature/coco-payGift-刘鹏飞' into qa · 3ac16d31
  刘鹏飞 committed Dec 15, 2020
  
  3ac16d31 Browse Files
- coco商品原单价=商品现单价+小料现单价 · d3d3bb8d
  刘鹏飞 committed Dec 15, 2020
  
  d3d3bb8d Browse Files
- Merge branch 'qa' of gitlab.freemud.com:order-group-application/order-group into qa · 96f5411f
  孙昱 committed Dec 15, 2020
  
  96f5411f Browse Files
- Merge branch 'feature/20201210_可选商品加料需求_yu.sun' into qa · 46f580fa
  孙昱 committed Dec 15, 2020
  
  46f580fa Browse Files
- sunyu::update::rollback · 74942a86
  孙昱 committed Dec 15, 2020
  
  74942a86 Browse Files
- Merge remote-tracking branch 'origin/qa' into qa · 21a49b86
  徐康 committed Dec 15, 2020
  
  21a49b86 Browse Files
- Merge branch 'feature/20201209_xukang_麦咖啡p4v2' into qa · 28795853
  徐康 committed Dec 15, 2020
  
  28795853 Browse Files
- 餐具商品 · dc16c446
  徐康 committed Dec 15, 2020
  
  dc16c446 Browse Files
- Merge branch 'qa' of gitlab.freemud.com:order-group-application/order-group into qa · 44f0210c
  孙昱 committed Dec 15, 2020
  
  44f0210c Browse Files
- Merge branch 'feature/20201210_可选商品加料需求_yu.sun' into qa · 55b48ccf
  孙昱 committed Dec 15, 2020
  
  55b48ccf Browse Files