From 7f5af45919cbda45e8be3b82d613708fad93718b Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期一, 15 七月 2024 21:00:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
cnas-server/src/main/java/com/yuanchu/mom/service/DeviceService.java | 9 +++++++--
1 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/cnas-server/src/main/java/com/yuanchu/mom/service/DeviceService.java b/cnas-server/src/main/java/com/yuanchu/mom/service/DeviceService.java
index d62ed5f..9268eda 100644
--- a/cnas-server/src/main/java/com/yuanchu/mom/service/DeviceService.java
+++ b/cnas-server/src/main/java/com/yuanchu/mom/service/DeviceService.java
@@ -1,6 +1,9 @@
package com.yuanchu.mom.service;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
+import com.yuanchu.mom.dto.DeviceDto;
+import com.yuanchu.mom.dto.DeviceDto1;
import com.yuanchu.mom.pojo.Device;
import java.util.List;
@@ -11,7 +14,7 @@
*/
public interface DeviceService extends IService<Device> {
- Map<String, Object> selectDeviceParameter(com.baomidou.mybatisplus.extension.plugins.pagination.Page page, Device itemParameter);
+ Map<String, Object> selectDeviceParameter(Page page, DeviceDto itemParameter);
int addDeviceParameter(Device itemParameter);
@@ -27,5 +30,7 @@
List<Device> selectDevicePrincipal();
-}
+ List<Device> selectDeviceByCategory(String inspectionItem, String inspectionItemSubclass);
+ Device selectDeviceByCode(String code);
+}
--
Gitblit v1.9.3