Merge remote-tracking branch 'origin/feature-management-2021-9-16' into feature-management-2021-9-16

# Conflicts:
#	fiveep-controller/src/main/java/com/bizmatics/controller/web/DeviceController.java
#	fiveep-controller/src/main/java/com/bizmatics/controller/web/PowerQualityConfigController.java
#	fiveep-service/src/main/java/com/bizmatics/service/DeviceService.java

fiveep-controller/src/main/java/com/bizmatics/controller/web/PowerQualityConfigController.java

@@ -3,7 +3,10 @@ package com.bizmatics.controller.web;
 
 import com.bizmatics.common.core.bean.ApiResult;
 import com.bizmatics.model.PowerQualityConfig;
+import com.bizmatics.model.WcBlackoutPlan;
+import com.bizmatics.model.vo.WcBlackoutPlanVo;
 import com.bizmatics.service.PowerQualityConfigService;
+import com.bizmatics.service.WcBlackoutPlanService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -11,7 +14,7 @@ import java.util.List;
 
 /**
  * <p>
- * 前端控制器
+ *  前端控制器
  * </p>
  *
  * @author ya
@@ -50,7 +53,6 @@ public class PowerQualityConfigController {
 
     /**
      * 站点管理-电能质量评分配置-注销
-     *
      * @param id 电能质量评分配置表主键ID
      * @return
      */
@@ -62,7 +64,6 @@ public class PowerQualityConfigController {
 
     /**
      * 站点管理-电能质量评分配置-查询
-     *
      * @param siteId 站点ID
      * @return
      */