From 562926922386bb24070ea27eb5a27193c41e996b Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期四, 18 四月 2024 14:46:50 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
cnas-server/src/main/java/com/yuanchu/mom/pojo/StandardMethod.java | 40 ++++++++++++++++++++++++++++------------
1 files changed, 28 insertions(+), 12 deletions(-)
diff --git a/cnas-server/src/main/java/com/yuanchu/mom/pojo/StandardMethod.java b/cnas-server/src/main/java/com/yuanchu/mom/pojo/StandardMethod.java
index d099dc5..3381c50 100644
--- a/cnas-server/src/main/java/com/yuanchu/mom/pojo/StandardMethod.java
+++ b/cnas-server/src/main/java/com/yuanchu/mom/pojo/StandardMethod.java
@@ -25,6 +25,15 @@
@TableId(type = IdType.AUTO)
private Integer id;
+ @ValueTableShow(value = 1, name = "棰嗗煙")
+ private String field;
+
+ private Integer structureTestObjectId;
+
+ @ValueTableShow(2)
+ @ApiModelProperty("妫�楠屽璞�")
+ private String sampleType;
+
/**
* 鏍囧噯缂栧彿
*/
@@ -39,11 +48,9 @@
@ApiModelProperty(value = "鏍囧噯鎻忚堪")
private String name;
- private Integer structureTestObjectId;
-
- @ValueTableShow(3)
- @ApiModelProperty("妫�楠屽璞�")
- private String sampleType;
+ @ValueTableShow(2)
+ @ApiModelProperty(value = "鏍囧噯鎻忚堪(鑻辨枃)")
+ private String nameEn;
/**
* 澶囨敞
@@ -51,6 +58,18 @@
@ValueTableShow(3)
@ApiModelProperty(value = "澶囨敞")
private String remark;
+
+ @ValueTableShow(4)
+ @ApiModelProperty(value = "璧勮川")
+ private String qualificationId;
+
+ @ValueTableShow(5)
+ @ApiModelProperty(value = "鏄惁浜у搧鏍囧噯")
+ private Integer isProduct;
+
+ @ValueTableShow(6)
+ @ApiModelProperty(value = "鏄惁鍚敤")
+ private Integer isUse;
@ApiModelProperty(value = "鍒涘缓浜篿d")
@TableField(fill = FieldFill.INSERT)
@@ -60,27 +79,24 @@
@TableField(fill = FieldFill.INSERT_UPDATE)
private Integer updateUser;
- @ValueTableShow(4)
+ @ValueTableShow(7)
@ApiModelProperty(value = "鍒涘缓浜�")
private String createUserName;
- @ValueTableShow(6)
+ @ValueTableShow(9)
@ApiModelProperty(value = "鏇存柊浜�")
private String updateUserName;
- @ValueTableShow(5)
+ @ValueTableShow(8)
@ApiModelProperty(value = "鍒涘缓鏃堕棿")
@TableField(fill = FieldFill.INSERT)
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime createTime;
- @ValueTableShow(7)
+ @ValueTableShow(10)
@ApiModelProperty(value = "鏇存柊鏃堕棿")
@TableField(fill = FieldFill.INSERT_UPDATE)
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime updateTime;
- @ValueTableShow(3)
- @ApiModelProperty(value = "鏄惁浜у搧鏍囧噯")
- private Integer isProduct;
}
\ No newline at end of file
--
Gitblit v1.9.3