Merge branch 'dev_zj' into dev

zss

2025-02-28 7d2330819e11cc505d3721373af34263f5c2fc16

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

@@ -134,12 +134,6 @@
        }
    }

    @ApiOperation(value = "获取设备负责人")
    @GetMapping("/selectDevicePrincipal")
    public Result selectDevicePrincipal() {
        return Result.success(deviceService.selectDevicePrincipal());
    }

    @ApiOperation(value = "通过项目获取设备列表")
    @GetMapping("/selectDeviceByCategory")
    public Result selectDeviceByCategory(String inspectionItem, String inspectionItemSubclass,String laboratory) {