Merge branch 'ww' into test

eladmin-system/src/main/java/cn/ysk/cashier/service/impl/productimpl/TbProductServiceImpl.java

@@ -267,7 +267,7 @@ public class TbProductServiceImpl implements TbProductService {
                 if (!CollectionUtils.isEmpty(skuCons)) {
                     Integer productSkuId = skuCons.get(0).getProductSkuId();
                     if (productSkuId != 0) {//添加至商品
-                        productNewVo.setIsSaveSku(1);
+                        productNewVo.setIsSaveSku(2);
                     }
                 }
             }

eladmin-system/src/main/java/cn/ysk/cashier/vo/TbProductNewVo.java

@@ -44,7 +44,7 @@ public class TbProductNewVo {
     //退款是否退回库存
     private Integer isRefundStock = 1;
 
-    private Integer isSaveSku = 0;
+    private Integer isSaveSku = 1;
 
     //库存警戒线
     private Integer warnLine = 0;