From 15e31c6e6550f9e8bf6fb1df5ca5ad4cc726b64f Mon Sep 17 00:00:00 2001
From: XiaoRuby <3114200645@qq.com>
Date: 星期六, 26 八月 2023 13:30:13 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
laboratory-server/src/main/java/com/yuanchu/limslaboratory/service/MetricalInformationService.java | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/laboratory-server/src/main/java/com/yuanchu/limslaboratory/service/MetricalInformationService.java b/laboratory-server/src/main/java/com/yuanchu/limslaboratory/service/MetricalInformationService.java
index 8d7d919..04ad32b 100644
--- a/laboratory-server/src/main/java/com/yuanchu/limslaboratory/service/MetricalInformationService.java
+++ b/laboratory-server/src/main/java/com/yuanchu/limslaboratory/service/MetricalInformationService.java
@@ -2,6 +2,7 @@
import com.yuanchu.limslaboratory.pojo.MetricalInformation;
import com.baomidou.mybatisplus.extension.service.IService;
+import com.yuanchu.limslaboratory.pojo.dto.UpdatedMetricalInformationDto;
import org.springframework.web.multipart.MultipartFile;
import java.util.List;
@@ -19,9 +20,11 @@
Integer addEquipmentPointInformation(MetricalInformation metricalInformation, MultipartFile file);
- List<Map<String, Object>> getListEquipmentPointInformation();
+ List<Map<String, Object>> getListEquipmentPointInformation(String InstrumentId);
Integer deleteMetricalInformation(Integer metricalInformationId);
Integer updateMetricalInformation(MetricalInformation metricalInformation, MultipartFile file);
+
+ boolean updateMetricalInformationInfo(UpdatedMetricalInformationDto dto);
}
--
Gitblit v1.9.3