Merge branch 'ww' into test

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

@@ -69,6 +69,7 @@ public class TbProductNewVo {
         private Integer id;
         private BigDecimal salePrice = new BigDecimal("0.00");
         private String specSnap="";
-        private Integer isPauseSale = 0;
+        private Integer isPauseSale;
+        private Integer isGrounding;
     }
 }