Merge branch 'shop_sku_price_down' into pre

# Conflicts:
#	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

@@ -172,10 +172,8 @@ public class CmsGoodsDonSkuController {
         BigDecimal oldPrice = dbSku.getPrice();
         BigDecimal newPrice = sku.getPrice();
         //规格变化
-        if (newPrice.compareTo(oldPrice) != 0) {
-            //下架店铺不在平台设置的价格区间
-            goodsDonSkuService.setBelowPriceShopSkuDown(skuId, newPrice);
-        }
+	    //下架店铺不在平台设置的价格区间
+	    goodsDonSkuService.setBelowPriceShopSkuDown(skuId, newPrice);
         //套餐包关联规格
         goodsDonSkuService.handleGptPackageSku(dbSku,sku);
         refreshCacheService.refreshYhHomePageCache();