From c6c30ead51b2ac1f7ffd4fb7e4b193c5d11d7bdf Mon Sep 17 00:00:00 2001
From: XiaoRuby <3114200645@qq.com>
Date: 星期四, 27 七月 2023 16:02:57 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
laboratory-server/src/main/java/com/yuanchu/limslaboratory/pojo/MetricalInformation.java | 3 +++
1 files changed, 3 insertions(+), 0 deletions(-)
diff --git a/laboratory-server/src/main/java/com/yuanchu/limslaboratory/pojo/MetricalInformation.java b/laboratory-server/src/main/java/com/yuanchu/limslaboratory/pojo/MetricalInformation.java
index 660d10d..5ee2a7c 100644
--- a/laboratory-server/src/main/java/com/yuanchu/limslaboratory/pojo/MetricalInformation.java
+++ b/laboratory-server/src/main/java/com/yuanchu/limslaboratory/pojo/MetricalInformation.java
@@ -35,6 +35,9 @@
@ApiModelProperty(value = "鐢ㄦ埛鍏宠仈Id", example = "7", required = true)
private Integer userId;
+ @ApiModelProperty(value = "浠櫒鍏宠仈Id", example = "1", required = true)
+ private Integer instrumentId;
+
@ApiModelProperty(value = "璁￠噺鍗曚綅", example = "GB", required = true)
private String measurementUnit;
--
Gitblit v1.9.3