Merge remote-tracking branch 'origin/master'

src/main/java/com/bonus/gzgqj/business/bases/entity/PaTypeVo.java

@@ -92,5 +92,14 @@ public class PaTypeVo {
 
     private String isWarn;
 
+    /**本次盘点量*/
+    private int checkNum;
+    /**盘盈量*/
+    private int addNum;
+    /**盘亏量*/
+    private int subNum;
+    /**报废量*/
+    private int scrapNum;
+
 
 }