Merge branch 'feature/20201217_四个非常搭套餐需求_yu.sun' into qa

# Conflicts:
#	shopping-cart-application-service/src/main/java/cn/freemud/adapter/ShoppingCartConvertAdapter.java

shopping-cart-application-service/src/main/java/cn/freemud/service/impl/mcoffee/ShoppingCartMCoffeeServiceImpl.java

@@ -1556,6 +1556,7 @@ public class ShoppingCartMCoffeeServiceImpl {
                         CartGoods.MaterialGoods materialGoods = new CartGoods.MaterialGoods();
                         materialGoods.setSpuId(materialRequestVo.getSpuId());
                         materialGoods.setGroupId(materialRequestVo.getGroupId());
+                        materialGoods.setCustomerCode(materialRequestVo.getCustomerCode());
                         comboxMaterialGoodsList.add(materialGoods);
                     }
                     productCombox.setProductMaterialList(comboxMaterialGoodsList);