Merge branch 'hotfix_隐藏真实库存' into test6.8.5

Conflicts:
	product/src/main/java/com/yohoufo/product/service/impl/ProductServiceImpl.java

@@ -655,8 +655,8 @@ public class ProductServiceImpl implements ProductService {
                     goodsSize.setLeastPrice(storagePrice == null ? null : storagePrice.getPrice());
                     goodsSize.setStatus(storagePrice == null ? null : storagePrice.getStatus());
                     //goodsSize.setStorageNum(storagePrice == null ? 0 : storage.getStorageNum());
-                    goodsSize.setStorageNum(goodsSize.getSkup() == null || goodsSize.getSkup() == 0 ? 0 : 1);
                     goodsSize.setSkup(storagePrice == null ? 0 : storagePrice.getSkup());
+                    goodsSize.setStorageNum(goodsSize.getSkup() == null || goodsSize.getSkup() == 0 ? 0 : 1);
                 }
             }
         }