草稿功能各个页面开发引起的查询bug，预告警单新增整改意见字段

pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/param/device/QuitRunningDeviceParam.java

@@ -8,7 +8,6 @@ import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
 
 import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotNull;
 import java.io.Serializable;
 import java.util.List;
 import java.util.Map;
@@ -35,14 +34,14 @@ public class QuitRunningDeviceParam  implements Serializable {
      * 设备编号
      */
     @ApiModelProperty(value = "设备编号")
-    @NotBlank(message = "设备编号不能为空")
+//    @NotBlank(message = "设备编号不能为空")
     private String deviceId;
 
     /**
      * 设备类型 1:装置；2:监测点
      */
     @ApiModelProperty(value = "设备类型")
-    @NotNull(message = "设备类型不能为空")
+//    @NotNull(message = "设备类型不能为空")
     private Integer deviceType;
 
     /**

pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/param/leaflet/WarningLeafletParam.java

@@ -97,7 +97,7 @@ public class WarningLeafletParam implements Serializable{
          * 采取措施
          */
         @ApiModelProperty(value = "采取措施")
-        @NotBlank(message = "采取措施不能为空")
+//        @NotBlank(message = "采取措施不能为空")
         private String takeStep;
 
 
@@ -105,7 +105,7 @@ public class WarningLeafletParam implements Serializable{
          * 处理成效报告
          */
         @ApiModelProperty(value = "处理成效报告")
-        @NotBlank(message = "处理成效报告不能为空")
+//        @NotBlank(message = "处理成效报告不能为空")
         private String reportPath;
 
 

pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/param/user/UserReportNormalParam.java

@@ -23,7 +23,8 @@ public class UserReportNormalParam extends BaseParam {
     private static final long serialVersionUID = 1L;
 
     private String id;
-
+    @ApiModelProperty(value = "保存1,提交审批2")
+    private String saveOrCheckflag;
     /**
      * 关联干扰源用户表
      */