Merge remote-tracking branch 'origin/master'

hdy

2024-01-08 60ebb5f4610ce79742a3781c71f7eda4043b7fac

 jcdm-main/src/main/java/com/jcdm/main/sc/stationConf/service/IScStationConfService.java

@@ -58,4 +58,6 @@
     * @return 结果
     */
    public int deleteScStationConfById(Long id);

    String getIpv4();
}