Commits · 49d34ef567aad56b6b0216f7b1b5c6aaf61858e4 · order-group-application / order-group · GitLab

15 Dec, 2020 7 commits
- Merge branch 'feature/20201209_xukang_麦咖啡p4v2' into qa · 49d34ef5
```
# Conflicts:
#	shopping-cart-application-service/src/main/java/cn/freemud/service/impl/mcoffee/ShoppingCartMCoffeeServiceImpl.java
```
  徐康 committed Dec 15, 2020
  49d34ef5 Browse Files
- Merge branch 'feature/20201210_可选商品加料需求_yu.sun' into qa · 771cdc54
  孙昱 committed Dec 15, 2020
  
  771cdc54 Browse Files
- sunyu::update::fix gbu · df59a2f0
  孙昱 committed Dec 15, 2020
  
  df59a2f0 Browse Files
- Merge branch 'qa' of gitlab.freemud.com:order-group-application/order-group into qa · bc617bab
  孙昱 committed Dec 15, 2020
  
  bc617bab Browse Files
- Merge branch 'feature/20201210_可选商品加料需求_yu.sun' into qa · 25e2c1e4
  孙昱 committed Dec 15, 2020
  
  25e2c1e4 Browse Files
- sunyu::update::fix bug · ade4bdbe
  孙昱 committed Dec 15, 2020
  
  ade4bdbe Browse Files
- 餐具商品 · 4fcc0db1
  徐康 committed Dec 15, 2020
  
  4fcc0db1 Browse Files
14 Dec, 2020 33 commits
- Merge branch 'feature/20201208_collageOrder_miaohui' into 'qa' · ee98f193
```
goodsTag新增列表配置

See merge request !92
```
  缪晖 committed Dec 14, 2020
  ee98f193 Browse Files
- goodsTag新增列表配置 · 586ea14a
  缪晖 committed Dec 14, 2020
  
  586ea14a Browse Files
- Merge remote-tracking branch 'remotes/origin/feature/coco-payGift-刘鹏飞' into qa · 24e6e673
  刘鹏飞 committed Dec 14, 2020
  
  24e6e673 Browse Files
- coco订单详情第二件半价活动拆行 · 89151fa7
  刘鹏飞 committed Dec 14, 2020
  
  89151fa7 Browse Files
- Merge branch 'qa' of http://gitlab.freemud.com/order-group-application/order-group into qa · cc57b13e
  刘鹏飞 committed Dec 14, 2020
  
  cc57b13e Browse Files
- 修复丢失的代码 · 95a549ca
  刘鹏飞 committed Dec 14, 2020
  
  95a549ca Browse Files
- Merge remote-tracking branch 'remotes/origin/master' into qa · 8abdc286
```
# Conflicts:
#	assortment-ordercenter-sdk/pom.xml
#	assortment-ordercenter-sdk/readme.md
#	order-application-service/pom.xml
```
  zhiheng.zhang committed Dec 14, 2020
  8abdc286 Browse Files
- 修复丢失的代码 · 06530139
  刘鹏飞 committed Dec 14, 2020
  
  06530139 Browse Files
- Merge remote-tracking branch 'origin/qa' into qa · 542ef18e
```
# Conflicts:
#	order-application-service/src/main/java/cn/freemud/adapter/OrderAdapter.java
```
  刘鹏飞 committed Dec 14, 2020
  542ef18e Browse Files
- 修复被合掉的代码 · 1e58130a
  刘鹏飞 committed Dec 14, 2020
  
  1e58130a Browse Files
- Merge branch 'qa' of gitlab.freemud.com:order-group-application/order-group into qa · 3f248424
  孙昱 committed Dec 14, 2020
  
  3f248424 Browse Files
- Merge branch 'feature/20201210_可选商品加料需求_yu.sun' into qa · 1b5b65fe
  孙昱 committed Dec 14, 2020
  
  1b5b65fe Browse Files
- sunyu::update::fix bug about groupProduct add Material · 9a5d07bd
  孙昱 committed Dec 14, 2020
  
  9a5d07bd Browse Files
- sunyu::update::fix bug about productGroup add material · 2a6aa1ac
  孙昱 committed Dec 14, 2020
  
  2a6aa1ac Browse Files
- Merge branch 'feature/20201208_collageOrder_miaohui' into 'master' · 5f2687c2
```
拼单组合商品优惠价格计算修复

See merge request !90
```
  缪晖 committed Dec 14, 2020
  5f2687c2 Browse Files
- Merge remote-tracking branch 'origin/qa' into qa · 3a04bfb5
  张洪旺 committed Dec 14, 2020
  
  3a04bfb5 Browse Files
- Merge branch '20201125-coco-zhw' of gitlab.freemud.com:order-group-application/order-group into qa · bab92061
  张洪旺 committed Dec 14, 2020
  
  bab92061 Browse Files
- 预约单付款 · 2533ed5e
  张洪旺 committed Dec 14, 2020
  
  2533ed5e Browse Files
- Merge remote-tracking branch 'remotes/origin/feature/2.1.1-临时测试用-去掉支付查询mq' into qa · f98ef596
  xiaoer.li committed Dec 14, 2020
  
  f98ef596 Browse Files
- modify:临时去掉mq轮训支付状态查询 · ec71bb8a
  xiaoer.li committed Dec 14, 2020
  
  ec71bb8a Browse Files
- QA环境被冲代码补回 · 777e6d33
  缪晖 committed Dec 14, 2020
  
  777e6d33 Browse Files
- Merge branch 'qa' of gitlab.freemud.com:order-group-application/order-group into qa · 802c708c
  孙昱 committed Dec 14, 2020
  
  802c708c Browse Files
- Merge branch 'feature/20201210_可选商品加料需求_yu.sun' into qa · 25fc5504
  孙昱 committed Dec 14, 2020
  
  25fc5504 Browse Files
- sunyu::conflicts::fix bug about combo-product price calculate · 2d7bda0b
  孙昱 committed Dec 14, 2020
  
  2d7bda0b Browse Files
- Merge branch 'qa' of http://gitlab.freemud.com/order-group-application/order-group into qa · 541e5c79
  刘鹏飞 committed Dec 14, 2020
  
  541e5c79 Browse Files
- Merge remote-tracking branch 'remotes/origin/feature/coco-payGift-刘鹏飞' into qa · a1887678
  刘鹏飞 committed Dec 14, 2020
  
  a1887678 Browse Files
- coco支付有礼添加活动号返回 · bf0b7ab1
  刘鹏飞 committed Dec 14, 2020
  
  bf0b7ab1 Browse Files
- Merge remote-tracking branch 'origin/qa' into qa · fd8998aa
  徐康 committed Dec 14, 2020
  
  fd8998aa Browse Files
- Merge branch 'bugfix/20201203_xukang_麦咖啡线上问题修复' into qa · fadeec79
  徐康 committed Dec 14, 2020
  
  fadeec79 Browse Files
- 非常搭 · 2bfec363
  徐康 committed Dec 14, 2020
  
  2bfec363 Browse Files
- Merge branch 'qa' of gitlab.freemud.com:order-group-application/order-group into qa · 8ab947e3
  孙昱 committed Dec 14, 2020
  
  8ab947e3 Browse Files
- Merge branch 'feature/20201210_可选商品加料需求_yu.sun' into qa · 5369f70e
  孙昱 committed Dec 14, 2020
  
  5369f70e Browse Files
- sunyu::updaet::fix bug about groupProduct add Material · 195403a0
  孙昱 committed Dec 14, 2020
  
  195403a0 Browse Files