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

lxp

2025-03-12 11af23e0c7976eed1211ba2ca0beae3a12e19310

 cnas-require/src/main/java/com/ruoyi/requier/controller/DeviceFaultController.java

@@ -43,8 +43,8 @@
        deviceFaultService.removeById(id);
    }

    @GetMapping("/device/{deviceId}")
    public Result<Map<String,Object>> getDeviceFaultsByDeviceId(@PathVariable Integer deviceId) {
    @GetMapping("/device")
    public Result<Map<String,Object>> getDeviceFaultsByDeviceId(Integer deviceId) {
       return  Result.success(deviceFaultService.findByDeviceId(deviceId));
    }
}
}