Merge branch 'master' into cnas

zss

2025-01-13 476740c4330135b38be6a32f54dbe1bbcd32476a

 cnas-server/src/main/java/com/yuanchu/mom/mapper/DeviceMapper.java

@@ -32,8 +32,10 @@
    //查询设备负责人
    List<Device> selectDevicePrincipal();

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

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

    List<Map<String, Object>> treeDevice(@Param("deviceName") String deviceName);
}