部分bug修改

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

@@ -21,11 +21,7 @@ import java.util.Map;
 @AllArgsConstructor
 @NoArgsConstructor
 public class SupervisionDevMainReportParam {
-    /**
-     * id
-     */
-    @ApiModelProperty(value = "id")
-    private String id;
+
 
     /**
      * 填报人
@@ -78,6 +74,18 @@ public class SupervisionDevMainReportParam {
     @ApiModelProperty(value = "用户名称")
     private String userName;
 
+    /**
+     *监测点台账信息
+     */
+    @ApiModelProperty(value = "监测点台账信息")
+    private String lineFilePath;
+    /**
+     * 台终端账信息文件
+     */
+    @ApiModelProperty(value = "监测点台账信息")
+    private String deviceFilePath;
+
+
     /**
      * 验收检验报告
      */

pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/po/device/SupervisionDevMainReportPO.java

@@ -75,6 +75,16 @@ public class SupervisionDevMainReportPO extends BaseEntity {
      */
     @TableField(value = "user_name")
     private String userName;
+    /**
+     *监测点台账信息
+     */
+    @TableField(value = "line_file_path")
+    private String lineFilePath;
+    /**
+     * 台终端账信息文件
+     */
+    @TableField(value = "device_file_path")
+    private String deviceFilePath;
 
     /**
      * 验收检验报告

pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/vo/survey/SupervisionGeneralSurveyPlanVO.java

@@ -24,6 +24,7 @@ import java.util.Map;
 @NoArgsConstructor
 public class SupervisionGeneralSurveyPlanVO extends BaseEntity {
 
+    private String planNo;
 
     /**
      * 单位ID