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

gongchunyi

2026-01-15 293dad30b91c26329aa165c6329220220e5bf8a1

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