From 6d9d9403e187ea02b3ccc70a0059b223ce288114 Mon Sep 17 00:00:00 2001 From: zss <zss@example.com> Date: 星期五, 21 六月 2024 18:00:27 +0800 Subject: [PATCH] 设备的检测项目显示 --- cnas-server/src/main/java/com/yuanchu/mom/pojo/StructureItemParameter.java | 28 ++++++++++++---------------- 1 files changed, 12 insertions(+), 16 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..fac6580 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; @@ -50,13 +46,13 @@ @ValueTableShow(4) @ApiModelProperty(value = "鍗曚环(鍏�)") - private BigDecimal price; + private String 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