Merge remote-tracking branch 'origin/dev-0' into dev-0

# Conflicts:
#	services/load-transfer-bf/src/main/java/com/hdkj/lt/bf/controller/optimization/IndicatorController.java
#	services/load-transfer-bf/src/main/java/com/hdkj/lt/bf/service/impl/SeAlarmServiceImpl.java
#	services/load-transfer-bf/src/main/java/com/hdkj/lt/bf/service/impl/SeIndicatorServiceImpl.java

services/load-transfer-bf/src/main/java/com/hdkj/lt/bf/application/FeederGroupApplication.java

@@ -231,7 +231,7 @@ public class FeederGroupApplication {
                 .collect(Collectors.toMap(FeederTopo::getFeeder, t -> t, (a, b) -> a));
         return feederList.stream()
                 .map(f -> {
-                    FeederLineVO vo = new FeederLineVO().setFeederId(f.getPsrId()).setFeederName(f.getName());
+                    FeederLineVO vo = new FeederLineVO().setFeederId(f.getPsrId()).setFeederName(StringUtils.removeStart(f.getName(),"10kV"));
                     FeederTopo topo = topoMap.get(f.getPsrId());
                     if (topo != null) {
                         vo.setStartSwitchId(topo.getPsrId()).setStartSwitchName(topo.getName());