Merge branch 'dev_ztns' into dev_ywx_ztns

zouyu

2025-07-25 ff1dcdad798b3fd484439e8a87a4d0ac75ab5720

 cnas-device/src/main/java/com/ruoyi/device/service/DeviceService.java

@@ -34,8 +34,6 @@

    List<Device> search(Integer status, String deviceName, String specificationModel, String largeCategory);

    List<Device> selectDevicePrincipal();

    List<Device> selectDeviceByCategory(String inspectionItem, String inspectionItemSubclass,String laboratory);

    DeviceDto selectDeviceByCode(Integer id);