From e9bf5a0070b5fbdf9afd4475adbf51e46f579040 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期四, 17 四月 2025 17:20:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_ztzb' into dev_ztzb

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