From 36ccc814cb2499757a0cfd5525d5e8d0c2309b64 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期三, 27 十一月 2024 16:02:42 +0800
Subject: [PATCH] 企业微信的消息提醒的信息改成单号样品名+检验下单的模版保存,如果存在同名的情况,将原有的情况覆盖掉,并添加提示框+首页展示添加样品名称
---
cnas-server/src/main/java/com/yuanchu/mom/pojo/StructureItemParameter.java | 19 ++++++++++++++-----
1 files changed, 14 insertions(+), 5 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 8c854db..16ac213 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,13 +46,14 @@
@ValueTableShow(4)
@ApiModelProperty(value = "鍗曚环(鍏�)")
- private BigDecimal price;
+ private String price;
- @ApiModelProperty(value = "瀹為獙瀹�")
+ @ApiModelProperty(value = "鍦烘墍")
+ @ValueTableShow(4)
private String laboratory;
@ValueTableShow(4)
- @ApiModelProperty(value = "瀛愬疄楠屽")
+ @ApiModelProperty(value = "璇曢獙瀹�")
private String sonLaboratory;
@ValueTableShow(5)
@@ -67,7 +68,7 @@
@ApiModelProperty(value = "璁￠噺鍗曚綅")
private String unit;
- @ValueTableShow(15)
+ @ValueTableShow(18)
@ApiModelProperty(value = "璇曢獙鏂规硶")
private String method;
@@ -76,7 +77,7 @@
private Double manHour;
@ValueTableShow(7)
- @ApiModelProperty(value = "棰勮鏃堕棿(澶�)")
+ @ApiModelProperty(value = "棰勮鏃堕棿(H)")
private Integer manDay;
@ValueTableShow(8)
@@ -129,5 +130,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