Merge remote-tracking branch 'origin/master'

ruoyi-admin/src/main/java/com/ruoyi/out/submit/domain/OutPickSubmit.java

@@ -38,7 +38,37 @@ public class OutPickSubmit extends BaseEntity
     @Excel(name = "物料数量")
     private String quantit;
 
-    public void setId(Long id) 
+    private String warehouseId;
+
+    private String exitId;
+
+    private String productName;
+
+    public String getWarehouseId() {
+        return warehouseId;
+    }
+
+    public void setWarehouseId(String warehouseId) {
+        this.warehouseId = warehouseId;
+    }
+
+    public String getExitId() {
+        return exitId;
+    }
+
+    public void setExitId(String exitId) {
+        this.exitId = exitId;
+    }
+
+    public String getProductName() {
+        return productName;
+    }
+
+    public void setProductName(String productName) {
+        this.productName = productName;
+    }
+
+    public void setId(Long id)
     {
         this.id = id;
     }