Merge remote-tracking branch 'origin/master'

signal-control-service/src/main/java/net/wanji/web/service/scheme/impl/SchemeConfigServiceImpl.java

@@ -117,7 +117,7 @@ public class SchemeConfigServiceImpl implements SchemeConfigService {
         // 构造方案列表
         List<SaveSchemeConfigDTO.PhaseScheme> phaseSchemeList = buildPhaseSchemeList(crossId);
         List<SaveSchemeConfigDTO.PhaseScheme> sort = phaseSchemeList.stream()
-                .sorted(Comparator.comparing(SaveSchemeConfigDTO.PhaseScheme::getSchemeNo))
+                .sorted(Comparator.comparing(scheme -> Integer.parseInt(scheme.getSchemeNo())))
                 .collect(Collectors.toList());
         saveSchemeConfigDTO.setPhaseSchemeList(sort);
         // todo 暂时只有环式