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

zouyu

2026-01-14 d2f503f72b5485bfee54ea296c7d0a9a243cea02

 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);