Merge branches 'feature-yu.sun-material-20201030' and 'qa' of…

Merge branches 'feature-yu.sun-material-20201030' and 'qa' of http://gitlab.freemud.com/order-group-application/order-group into qa

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

@@ -133,6 +133,8 @@ public class ShoppingCartConvertAdapter {
                 goods.setSpuName(materialGoods.getSpuName());
                 goods.setOriginalPrice(materialGoods.getOriginalPrice());
                 goods.setSalePrice(materialGoods.getFinalPrice());
+                goods.setCustomerCode(materialGoods.getCustomerCode());
+                goods.setProductCode(materialGoods.getCustomerCode());
                 goods.setQty(cartGoods.getQty());
                 goods.setTotalDiscountAmount(0);
                 materialList.add(goods);