From e029c61aa09bf1ae1af7b07fa4e78d87442c44f1 Mon Sep 17 00:00:00 2001
From: value <z1292839451@163.com>
Date: 星期三, 19 六月 2024 00:50:09 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
cnas-server/src/main/java/com/yuanchu/mom/pojo/StructureItemParameter.java | 12 ++++++++++--
1 files changed, 10 insertions(+), 2 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 9dd4be0..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
@@ -46,7 +46,7 @@
@ValueTableShow(4)
@ApiModelProperty(value = "鍗曚环(鍏�)")
- private BigDecimal price;
+ private String price;
@ApiModelProperty(value = "鍦烘墍")
private String laboratory;
@@ -67,7 +67,7 @@
@ApiModelProperty(value = "璁￠噺鍗曚綅")
private String unit;
- @ValueTableShow(15)
+ @ValueTableShow(18)
@ApiModelProperty(value = "璇曢獙鏂规硶")
private String method;
@@ -129,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