From 29cadb9df9e289fc4dd45d17e577fe9695232ea4 Mon Sep 17 00:00:00 2001
From: value <z1292839451@163.com>
Date: 星期四, 30 五月 2024 22:35:45 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
cnas-server/src/main/java/com/yuanchu/mom/pojo/StructureItemParameter.java | 18 +++---------------
1 files changed, 3 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..9dd4be0 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(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