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

zss

2025-04-17 e9bf5a0070b5fbdf9afd4475adbf51e46f579040

 cnas-device/src/main/java/com/ruoyi/device/mapper/DeviceMapper.java

@@ -29,9 +29,6 @@
    //获取图片数据
    void selectDeviceImage(@Param(value = "name") String name ,@Param(value = "id") Integer id);

    //查询设备负责人
    List<Device> selectDevicePrincipal();

    IPage<DeviceDto> selectDeviceParameterPage(Page page, @Param("ew") QueryWrapper<DeviceDto> queryWrappers, @Param("laboratoryNameIsNull") Boolean laboratoryNameIsNull);

    List<Map<String, Object>> getInspectionItemSubclass(@Param("id") Integer id);