From d0a6fc23f31f924cb1744397478dc4c7c57c04e1 Mon Sep 17 00:00:00 2001
From: XiaoRuby <3114200645@qq.com>
Date: 星期六, 19 八月 2023 09:58:40 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
laboratory-server/src/main/java/com/yuanchu/limslaboratory/pojo/MetricalInformation.java | 6 ++++++
1 files changed, 6 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..07225d3 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
@@ -32,9 +32,15 @@
@TableId(value = "id", type = IdType.AUTO)
private Integer id;
+ @ApiModelProperty(value = "璁￠噺缂栧彿", example = "1", required = true)
+ private String code;
+
@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