From 762c419bb29a48557b7bf18cc3bf9c84309bc90e Mon Sep 17 00:00:00 2001
From: value <z1292839451@163.com>
Date: 星期四, 06 六月 2024 15:52:48 +0800
Subject: [PATCH] 增加检验项分类

---
 cnas-server/src/main/java/com/yuanchu/mom/pojo/StructureItemParameter.java |   26 +++++++++++---------------
 1 files changed, 11 insertions(+), 15 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..9d59109 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;
@@ -52,11 +48,11 @@
     @ApiModelProperty(value = "鍗曚环(鍏�)")
     private BigDecimal price;
 
-    @ApiModelProperty(value = "瀹為獙瀹�")
+    @ApiModelProperty(value = "鍦烘墍")
     private String laboratory;
 
     @ValueTableShow(4)
-    @ApiModelProperty(value = "瀛愬疄楠屽")
+    @ApiModelProperty(value = "璇曢獙瀹�")
     private String sonLaboratory;
 
     @ValueTableShow(5)
@@ -71,7 +67,7 @@
     @ApiModelProperty(value = "璁¢噺鍗曚綅")
     private String unit;
 
-    @ValueTableShow(6)
+    @ValueTableShow(18)
     @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 = "鐗规畩鏍囪瘑")
@@ -141,5 +129,13 @@
     @ApiModelProperty(value = "瀛楀吀绫诲瀷")
     private String dic;
 
+    @ValueTableShow(16)
+    @ApiModelProperty(value = "妫�楠岄」鍒嗙被")
+    private String inspectionItemClass;
+
+    @ValueTableShow(17)
+    @ApiModelProperty(value = "妫�楠岄」鍒嗙被EN")
+    private String inspectionItemClassEn;
+
 }
 

--
Gitblit v1.9.3