From cfdaaae8690e188f6971057259873aa408ebc9e3 Mon Sep 17 00:00:00 2001
From: Crunchy <3114200645@qq.com>
Date: 星期四, 25 四月 2024 16:49:56 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
cnas-server/src/main/java/com/yuanchu/mom/pojo/StructureTestObject.java | 13 ++++++++++++-
1 files changed, 12 insertions(+), 1 deletions(-)
diff --git a/cnas-server/src/main/java/com/yuanchu/mom/pojo/StructureTestObject.java b/cnas-server/src/main/java/com/yuanchu/mom/pojo/StructureTestObject.java
index e5cbc2d..c85ec7c 100644
--- a/cnas-server/src/main/java/com/yuanchu/mom/pojo/StructureTestObject.java
+++ b/cnas-server/src/main/java/com/yuanchu/mom/pojo/StructureTestObject.java
@@ -25,9 +25,20 @@
private Integer id;
@ValueTableShow(1)
- @ApiModelProperty(value = "鏍峰搧鍚嶇О")
+ @ApiModelProperty(value = "鍦烘墍")
+ private Integer laboratory;
+
+ @TableField(exist = false)
+ private Integer laboratory_id;
+
+ @ValueTableShow(1)
+ @ApiModelProperty(value = "妫�楠屽璞�")
private String specimenName;
+ @ValueTableShow(2)
+ @ApiModelProperty(value = "瀵硅薄浠ｅ彿")
+ private String code;
+
@ApiModelProperty(value = "鍒涘缓浜篿d")
@TableField(fill = FieldFill.INSERT)
private Integer createUser;
--
Gitblit v1.9.3