Merge remote-tracking branch 'origin/dev_ztzb' into dev_ztzb

zhuo

2025-04-21 09c297c75f036f017dedfb163e338c6c427477d5

 cnas-device/src/main/java/com/ruoyi/device/controller/DeviceController.java

@@ -188,7 +188,7 @@
    }

    @ApiOperation(value = "删除数采配置")
    @DeleteMapping("/  ")
    @DeleteMapping("/deleteDataAcquisitionConfiguration")
    public Result<?> deleteDataAcquisitionConfiguration(@RequestParam("ids") String ids) {
        List<String> split = Arrays.asList(ids.split(","));
        List<String> collect = split.stream().distinct().collect(Collectors.toList());