Merge branch 'master' into dev

zss

2024-11-26 af430e03b2f1a1db9369b17a96896dcec9217919

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

@@ -35,5 +35,7 @@
    IPage<DeviceDto> selectDeviceParameterPage(Page page, @Param("ew") QueryWrapper<DeviceDto> queryWrappers);

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

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