From 599b942446bb8bfc1f6d12c1fcb22a5e95398b37 Mon Sep 17 00:00:00 2001
From: 李林 <z1292839451@163.com>
Date: 星期三, 13 三月 2024 16:12:39 +0800
Subject: [PATCH] 功能调整
---
cnas-server/src/main/java/com/yuanchu/mom/pojo/StructureItemParameter.java | 18 +++++++++++++-----
1 files changed, 13 insertions(+), 5 deletions(-)
diff --git a/cnas-server/src/main/java/com/yuanchu/mom/pojo/StructureItemParameter.java b/cnas-server/src/main/java/com/yuanchu/mom/pojo/StructureItemParameter.java
index 83ab2fa..51ec312 100644
--- a/cnas-server/src/main/java/com/yuanchu/mom/pojo/StructureItemParameter.java
+++ b/cnas-server/src/main/java/com/yuanchu/mom/pojo/StructureItemParameter.java
@@ -41,12 +41,16 @@
@ApiModelProperty(value = "瀹為獙瀹�")
private String laboratory;
+ @ValueTableShow(4)
+ @ApiModelProperty(value = "瀛愬疄楠屽")
+ private String sonLaboratory;
+
@ValueTableShow(5)
@ApiModelProperty(value = "璁￠噺鍗曚綅")
private String unit;
@ValueTableShow(5)
- @ApiModelProperty(value = "妫�楠屾爣鍑�")
+ @ApiModelProperty(value = "鏍囧噯鏂规硶")
private String method;
@ValueTableShow(6)
@@ -55,7 +59,7 @@
@ValueTableShow(7)
@ApiModelProperty(value = "宸ユ椂(H)")
- private Integer manHour;
+ private Double manHour;
@ValueTableShow(7)
@ApiModelProperty(value = "棰勮鏃堕棿(澶�)")
@@ -85,18 +89,22 @@
@ApiModelProperty(value = "鍖洪棿")
private String section;
- @ValueTableShow(13)
+ /*@ValueTableShow(13)
@ApiModelProperty(value = "鍙栧�肩被鍨�")
- private String valueType;
+ private String valueType;*/
@ValueTableShow(13)
@ApiModelProperty(value = "鐗规畩鏍囪瘑")
private String bsm;
@ValueTableShow(5)
- @ApiModelProperty(value = "鏍峰搧鍚嶇О")
+ @ApiModelProperty(value = "妫�楠屽璞�")
private String sample;
+ @ValueTableShow(14)
+ @ApiModelProperty(value = "鍘熷璁板綍妯℃澘")
+ private Integer templateId;
+
@ApiModelProperty(value = "鍒涘缓浜篿d")
@TableField(fill = FieldFill.INSERT)
private Integer createUser;
--
Gitblit v1.9.3