From ad54d502450e219c38f7d9b878ae07f759ab2a23 Mon Sep 17 00:00:00 2001
From: 朱佳吉 <1527963051@qq.com>
Date: 星期二, 07 五月 2024 17:58:54 +0800
Subject: [PATCH] Merge branch 'master' of http://114.132.189.42:9002/r/center-lims-after

---
 cnas-server/src/main/java/com/yuanchu/mom/pojo/StructureItemParameter.java |   14 +-------------
 1 files changed, 1 insertions(+), 13 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 8386d6c..8c854db 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
@@ -32,10 +32,6 @@
     @ApiModelProperty(value = "妫�楠岄」EN")
     private String inspectionItemEn;
 
-//    @ValueTableShow(2)
-//    @ApiModelProperty(value = "妫�楠屽垎绫�")
-//    private String inspectionItemClassify;
-
     @ValueTableShow(3)
     @ApiModelProperty(value = "妫�楠屽瓙椤�")
     private String inspectionItemSubclass;
@@ -71,7 +67,7 @@
     @ApiModelProperty(value = "璁¢噺鍗曚綅")
     private String unit;
 
-    @ValueTableShow(6)
+    @ValueTableShow(15)
     @ApiModelProperty(value = "璇曢獙鏂规硶")
     private String method;
 
@@ -95,19 +91,11 @@
     @ApiModelProperty(value = "妫�楠屽�肩被鍨�")
     private String inspectionValueType;
 
-    @ApiModelProperty(value = "璁惧缁�")
-    private String deviceGroup;
-
     @ApiModelProperty(value = "妫�楠屾鏁�")
     private Integer checkoutNumber;
 
-    @ValueTableShow(12)
     @ApiModelProperty(value = "鍖洪棿")
     private String section;
-
-    /*@ValueTableShow(13)
-    @ApiModelProperty(value = "鍙栧�肩被鍨�")
-    private String valueType;*/
 
     @ValueTableShow(13)
     @ApiModelProperty(value = "鐗规畩鏍囪瘑")

--
Gitblit v1.9.3