From c9a7198eb87bcd7ac8d2b21d6cf9d977e726fdd2 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期二, 23 七月 2024 10:31:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
cnas-server/src/main/java/com/yuanchu/mom/service/DeviceService.java | 5 ++++-
1 files changed, 4 insertions(+), 1 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 9268eda..2ae0473 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
@@ -3,9 +3,10 @@
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 com.yuanchu.mom.vo.Result;
+import javax.servlet.http.HttpServletRequest;
import java.util.List;
import java.util.Map;
@@ -33,4 +34,6 @@
List<Device> selectDeviceByCategory(String inspectionItem, String inspectionItemSubclass);
Device selectDeviceByCode(String code);
+
+ Result<?> dataAcquisition(HttpServletRequest request, Integer id, String entrustCode, String sampleCode);
}
--
Gitblit v1.9.3