From ee6692dc41439b6213c226d21d8286ba17cb7e43 Mon Sep 17 00:00:00 2001
From: value <z1292839451@163.com>
Date: 星期三, 01 五月 2024 10:13:36 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
cnas-server/src/main/java/com/yuanchu/mom/pojo/Seal.java | 15 +++++++++------
1 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/cnas-server/src/main/java/com/yuanchu/mom/pojo/Seal.java b/cnas-server/src/main/java/com/yuanchu/mom/pojo/Seal.java
index 8154dec..59c8ed3 100644
--- a/cnas-server/src/main/java/com/yuanchu/mom/pojo/Seal.java
+++ b/cnas-server/src/main/java/com/yuanchu/mom/pojo/Seal.java
@@ -21,22 +21,25 @@
@TableId(type = IdType.AUTO)
private Integer id;
+ @ApiModelProperty(value = "瀹為獙瀹d")
+ private Integer labId;
+
+ @TableField(exist=false)
@ValueTableShow(2)
- @ApiModelProperty(value = "鍗扮珷鍦板潃")
+ @ApiModelProperty(value = "瀹為獙瀹ゅ悕绉�")
+ private String laboratoryName;
+ @ValueTableShow(3)
+ @ApiModelProperty(value = "鍗扮珷鍥剧墖")
private String address;
- @ValueTableShow(3)
+ @ValueTableShow(4)
@ApiModelProperty(value = "鍗扮珷绫诲瀷")
private String type;
@ApiModelProperty(value = "鍒涘缓浜篿d")
@TableField(fill = FieldFill.INSERT)
private Integer createUser;
- @ValueTableShow(5)
- @ApiModelProperty(value = "鍒涘缓鏃堕棿")
- @TableField(fill = FieldFill.INSERT)
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime createTime;
-
}
--
Gitblit v1.9.3