From dd571bf55de7f9a72d458adc179958ed2f9473c0 Mon Sep 17 00:00:00 2001
From: XiaoRuby <3114200645@qq.com>
Date: 星期一, 21 八月 2023 09:39:09 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
laboratory-server/src/main/java/com/yuanchu/limslaboratory/pojo/Instrument.java | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/laboratory-server/src/main/java/com/yuanchu/limslaboratory/pojo/Instrument.java b/laboratory-server/src/main/java/com/yuanchu/limslaboratory/pojo/Instrument.java
index 0d7fcdb..4c7b28b 100644
--- a/laboratory-server/src/main/java/com/yuanchu/limslaboratory/pojo/Instrument.java
+++ b/laboratory-server/src/main/java/com/yuanchu/limslaboratory/pojo/Instrument.java
@@ -39,6 +39,7 @@
private Integer userId;
@ApiModelProperty(value = "淇濈浜猴細鐢ㄦ埛琛ㄥ叧鑱擨d", hidden = true)
+ @TableField(value = "")
private Integer createUserId;
@ApiModelProperty(value = "浠櫒璁惧缂栧彿", example = "JSTC-W1-00001", required = true)
--
Gitblit v1.9.3