From 1ebe2726a5f8fe55f01481b37d1ac1f75a088520 Mon Sep 17 00:00:00 2001 From: Crunchy <3114200645@qq.com> Date: 星期四, 25 四月 2024 16:34:23 +0800 Subject: [PATCH] 2024-4-25 资源要求-设备管理后端调整 --- cnas-server/src/main/java/com/yuanchu/mom/pojo/StructureItemParameter.java | 44 +++++++++++++++++++++++++++++++------------- 1 files changed, 31 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 7459e7d..4ce5560 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 @@ -29,13 +29,29 @@ @ApiModelProperty(value = "妫�楠岄」") private String inspectionItem; + @ValueTableShow(2) + @ApiModelProperty(value = "妫�楠岄」EN") + private String inspectionItemEn; + // @ValueTableShow(2) -// @ApiModelProperty(value = "妫�楠屽瓙椤�") +// @ApiModelProperty(value = "妫�楠屽垎绫�") // private String inspectionItemClassify; @ValueTableShow(3) - @ApiModelProperty(value = "妫�楠岄」瀛愰」") + @ApiModelProperty(value = "妫�楠屽瓙椤�") private String inspectionItemSubclass; + + @ValueTableShow(3) + @ApiModelProperty(value = "妫�楠屽瓙椤笶N") + private String inspectionItemSubclassEn; + + @ValueTableShow(3) + @ApiModelProperty(value = "妫�楠屽璞�") + private Integer sample; + + @ValueTableShow(4) + @ApiModelProperty(value = "鍗曚环(鍏�)") + private BigDecimal price; @ValueTableShow(4) @ApiModelProperty(value = "瀹為獙瀹�") @@ -46,16 +62,20 @@ private String sonLaboratory; @ValueTableShow(5) + @ApiModelProperty(value = "瑕佹眰鎻忚堪") + private String askTell; + + @ValueTableShow(5) + @ApiModelProperty(value = "瑕佹眰鍊�") + private String ask; + + @ValueTableShow(5) @ApiModelProperty(value = "璁¢噺鍗曚綅") private String unit; - @ValueTableShow(5) + @ValueTableShow(6) @ApiModelProperty(value = "璇曢獙鏂规硶") private String method; - - @ValueTableShow(6) - @ApiModelProperty(value = "鍗曚环(鍏�)") - private BigDecimal price; @ValueTableShow(7) @ApiModelProperty(value = "宸ユ椂(H)") @@ -77,11 +97,9 @@ @ApiModelProperty(value = "妫�楠屽�肩被鍨�") private String inspectionValueType; - @ValueTableShow(10) @ApiModelProperty(value = "璁惧缁�") private String deviceGroup; - @ValueTableShow(11) @ApiModelProperty(value = "妫�楠屾鏁�") private Integer checkoutNumber; @@ -96,10 +114,6 @@ @ValueTableShow(13) @ApiModelProperty(value = "鐗规畩鏍囪瘑") private String bsm; - - @ValueTableShow(5) - @ApiModelProperty(value = "妫�楠屽璞�") - private Integer sample; @ValueTableShow(14) @ApiModelProperty(value = "鍘熷璁板綍妯℃澘") @@ -125,5 +139,9 @@ @ValueTableShow(15) private LocalDateTime updateTime; + @ValueTableShow(9) + @ApiModelProperty(value = "瀛楀吀绫诲瀷") + private String dic; + } -- Gitblit v1.9.3