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

@@ -267,7 +267,7 @@ public class ShoppingCartConvertAdapter {
             ShoppingCartGoodsDto.CartGoodsDetailDto cartGoodsDetailDto = new ShoppingCartGoodsDto.CartGoodsDetailDto();
             cartGoodsDetailDto.setTaxId(cartGoods.getTaxId());
             cartGoodsDetailDto.setTax(cartGoods.getTax());
-            cartGoodsDetailDto.setSpuId(comboxGoods.getGoodsId());
+            cartGoodsDetailDto.setSpuId(comboxGoods.getSpuId());
             cartGoodsDetailDto.setSpuName(comboxGoods.getSpuName());
             cartGoodsDetailDto.setSkuId(comboxGoods.getGoodsId());
             cartGoodsDetailDto.setSkuName(StringUtils.isEmpty(comboxGoods.getSkuName()) ? comboxGoods.getSpuName() : comboxGoods.getSkuName());