diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/mapping/PmsGeneratrixWireMapper.xml b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/mapping/PmsGeneratrixWireMapper.xml
index 19b0679c9..ec78328cc 100644
--- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/mapping/PmsGeneratrixWireMapper.xml
+++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/mapping/PmsGeneratrixWireMapper.xml
@@ -51,7 +51,7 @@
 
         FROM
         pms_generatrix_wire AS pg
-        LEFT JOIN pms_statation_stat AS pss ON pg.station = pss.Power_Id
+        LEFT JOIN pms_statation_stat AS pss ON pg.station_id = pss.Power_Id
         WHERE
         pg.`Status` = 1
         AND pss.`Status` = 1
diff --git a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/OverviewVO.java b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/OverviewVO.java
index 0bf655332..c96b3898c 100644
--- a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/OverviewVO.java
+++ b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/OverviewVO.java
@@ -4,7 +4,6 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.io.Serializable;
-import java.util.List;
 
 /**
  * <功能描述>
@@ -35,11 +34,14 @@ public class OverviewVO implements Serializable {
     public static class GroupVO {
         private static final long serialVersionUID = 1L;
 
-        @ApiModelProperty(name = "monitorSort", value = "监测点类别")
-        private String monitorSort;
-
-        @ApiModelProperty(name = "subset", value = "子集集合")
-        private List<?> subset;
+        @ApiModelProperty(name = "city", value = "地级市")
+        private String city;
+        @ApiModelProperty(name = "oneLine", value = "Ⅰ类监测点")
+        private Integer oneLine;
+        @ApiModelProperty(name = "twoLine", value = "Ⅱ类监测点")
+        private Integer twoLine;
+        @ApiModelProperty(name = "threeLine", value = "Ⅲ类监测点")
+        private Integer threeLine;
 
     }