Merge branch 'develop' of gitadmin/tuoheng_freeway into release

tuoheng-service/tuoheng-admin/src/main/java/com/tuoheng/admin/entity/FlightData.java

@@ -15,6 +15,7 @@ import lombok.experimental.Accessors;
 @Accessors(chain = true)
 @TableName("th_flight_data")
 public class FlightData extends BaseEntity {
+
     private static final long serialVersionUID = 1L;
 
     /**
@@ -27,7 +28,6 @@ public class FlightData extends BaseEntity {
      */
     private String tenantId;
 
-
     /**
      * 云盒SN号
      */
@@ -88,5 +88,4 @@ public class FlightData extends BaseEntity {
      */
     private Integer isSrt;
 
-
 }

tuoheng-service/tuoheng-admin/src/main/java/com/tuoheng/admin/vo/ReportPageListVo.java

@@ -16,6 +16,11 @@ import java.util.Date;
 @Data
 public class ReportPageListVo {
 
+    /**
+     * 报告ID
+     */
+    private String id;
+
     /**
      * 任务编号
      */