Merge branch 'shop_sku_price_down' into pre

# Conflicts:
#	netflix-service/src/main/java/com/cyksj/service/mange/goods/CmsGoodsDonSkuServiceImpl.java
#	netflix-web/src/main/java/com/cyksj/web/controller/manage/goods/CmsGoodsDonSkuController.java

netflix-web/src/main/java/com/cyksj/web/controller/manage/goods/CmsGoodsDonSkuController.java

@@ -171,11 +171,11 @@ public class CmsGoodsDonSkuController {
         //前后两次价格不同 下架店铺低于这个折扣最低价格
         BigDecimal oldPrice = dbSku.getPrice();
         BigDecimal newPrice = sku.getPrice();
-        //规格新价 变高
-	    //下架店铺不在平台设置的价格区间
+        //规格变化
+        //下架店铺不在平台设置的价格区间
         goodsDonSkuService.setBelowPriceShopSkuDown(skuId, newPrice);
-        //套餐包关联规格
-        goodsDonSkuService.handleGptPackageSku(dbSku,sku);
+	    //套餐包关联规格
+	    goodsDonSkuService.handleGptPackageSku(dbSku,sku);
         refreshCacheService.refreshYhHomePageCache();
         return GatewayResponse.SUCCESS.newBuilder().toResult();
     }