Merge remote-tracking branch 'origin/master'

hdy

2024-01-08 60ebb5f4610ce79742a3781c71f7eda4043b7fac

 jcdm-main/src/main/java/com/jcdm/main/sc/stationConf/controller/ScStationConfController.java

@@ -101,4 +101,14 @@
    {
        return toAjax(scStationConfService.deleteScStationConfByIds(ids));
    }

    /**
     * 获取工位终端配置详细信息
     */
    @GetMapping(value = "/getIpv4")
    public AjaxResult getIpv4()
    {
        return success(scStationConfService.getIpv4());
    }

}