From ff1dcdad798b3fd484439e8a87a4d0ac75ab5720 Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期五, 25 七月 2025 16:30:08 +0800
Subject: [PATCH] Merge branch 'dev_ztns' into dev_ywx_ztns

---
 cnas-device/src/main/java/com/ruoyi/device/service/DeviceService.java |    2 --
 1 files changed, 0 insertions(+), 2 deletions(-)

diff --git a/cnas-device/src/main/java/com/ruoyi/device/service/DeviceService.java b/cnas-device/src/main/java/com/ruoyi/device/service/DeviceService.java
index b732701..72073e9 100644
--- a/cnas-device/src/main/java/com/ruoyi/device/service/DeviceService.java
+++ b/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);

--
Gitblit v1.9.3