From ea7654c0cdb21ec7e8f854df6d0a7367b5e5d6ac Mon Sep 17 00:00:00 2001
From: Crunchy <3114200645@qq.com>
Date: 星期二, 04 六月 2024 11:58:25 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
inspect-server/src/main/java/com/yuanchu/mom/pojo/StandardMethodList.java | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/pojo/StandardMethodList.java b/inspect-server/src/main/java/com/yuanchu/mom/pojo/StandardMethodList.java
index d966b44..1a42827 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/pojo/StandardMethodList.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/pojo/StandardMethodList.java
@@ -50,7 +50,7 @@
private String laboratory;
@ApiModelProperty("鏍峰搧鍒嗙被")
- private String sample_type;
+ private String sampleType;
@ApiModelProperty("鏍峰搧")
private String sample;
@@ -61,6 +61,9 @@
@ApiModelProperty("")
@TableField(fill = FieldFill.INSERT)
private Integer createUser;
+
+ @TableField(exist = false)
+ private String createUserName;
/**
*
*/
--
Gitblit v1.9.3