Merge remote-tracking branch 'origin/master'

pqs-process/process-api/src/main/java/com/njcn/process/pojo/param/StrategyParam.java

@@ -36,7 +36,7 @@ public class StrategyParam {
         @ApiModelProperty("名称")
         private String name;
 
-        @ApiModelProperty("等级（0：一级；1：二级；2：三级）")
+        @ApiModelProperty("等级（0:自动策略 1:手动策略 2:排除策略）")
         private Integer grade;
 
         @ApiModelProperty(value = "区分预警单/告警单（0：预警单 ；1：告警单）")
@@ -142,9 +142,6 @@ public class StrategyParam {
         @ApiModelProperty("名称")
         private String name;
 
-//        @ApiModelProperty("变电站信息")
-//        private List<Power> childPower;
-
         @ApiModelProperty("子节点详细信息")
         private List<?> children;
     }

pqs-process/process-api/src/main/java/com/njcn/process/pojo/vo/SurveyPlanExcel.java

@@ -38,8 +38,8 @@ public class SurveyPlanExcel  implements Serializable {
     @Excel(name = "变电站数量", width = 15)
     private Long subCount;
 
-    @Excel(name = "母线数量", width = 15)
-    private Long busCount;
+//    @Excel(name = "母线数量", width = 15)
+//    private Long busCount;
 
     @Excel(name = "计划状态", width = 15)
     private String status;