Merge remote-tracking branch 'origin/send_coupon' into send_coupon

peng

6 天以前 5100e0fe44f260d81b7416d0de46962926709cab

 framework/src/main/java/cn/lili/modules/goods/sku/GoodsSkuBuilder.java

@@ -64,7 +64,7 @@
        Map<String, Object> specMap = new LinkedHashMap<>();

        // 原始规格项
        String[] ignoreOriginKeys = {"id", "sn", "cost", "price", "quantity", "weight", "alertQuantity"};
        String[] ignoreOriginKeys = {"id", "sn", "cost", "price", "quantity", "weight", "alertQuantity","couponId","couponName"};
        //获取规格信息
        for (Map.Entry<String, Object> spec : skuInfo.entrySet()) {
            //保存新增规格信息