Merge branch 'feature/1.9.13-mall-20200219-dingkai' into develop

assortment-shoppingcart-sdk/src/main/java/com/freemud/sdk/api/assortment/shoppingcart/adapter/ShoppingCartAdapter.java

@@ -311,7 +311,7 @@ public class ShoppingCartAdapter {
             //咨询商品服务，套餐售价取originalPrice
             cartGoods.setFinalPrice(isSetMealProduct ? spuProduct.getOriginalPrice() : isSkuProduct ? skuProduct.getFinalPrice() : spuProduct.getFinalPrice());
             cartGoods.setWeight(isSkuProduct ? skuProduct.getWeight() : spuProduct.getWeight());
-            cartGoods.setUnit(spuProduct.getUnit());
+            cartGoods.setUnit(isSkuProduct ? skuProduct.getUnit() : spuProduct.getUnit());
             cartGoods.setWeightType(CommonsConstant.WEIGHT_PRODUCT.equals(spuProduct.getWeightType()));
         } catch (Exception ex) {
             ErrorLog.infoConvertJson(this.getClass(),"updateCartGoodsInfoNew_Error",ex);