Merge remote-tracking branch 'origin/wvp-28181-2.0' into wvp-28181-2.0

src/main/java/com/genersoft/iot/vmp/vmanager/bean/StreamPushExcelDto.java

@@ -22,6 +22,9 @@ public class StreamPushExcelDto {
     @ExcelProperty("目录ID")
     private String catalogId;
 
+    @ExcelProperty("在线状态")
+    private boolean status;
+
     public String getName() {
         return name;
     }
@@ -70,4 +73,16 @@ public class StreamPushExcelDto {
     public void setCatalogId(String catalogId) {
         this.catalogId = catalogId;
     }
+
+    public boolean isStatus() {
+        return status;
+    }
+
+    public boolean getStatus() {
+        return status;
+    }
+
+    public void setStatus(boolean status) {
+        this.status = status;
+    }
 }