From f086664481f69eda8a5dd30747b3ed7cb496b9ba Mon Sep 17 00:00:00 2001
From: Calvin <2440603509@qq.com>
Date: 星期三, 31 七月 2024 09:53:48 +0800
Subject: [PATCH] Merge branch 'master' of http://114.132.189.42:9002/r/center-lims-after
---
cnas-server/src/main/java/com/yuanchu/mom/dto/DeviceConfigDtoPage.java | 11 ++++++++++-
1 files changed, 10 insertions(+), 1 deletions(-)
diff --git a/cnas-server/src/main/java/com/yuanchu/mom/dto/DeviceConfigDtoPage.java b/cnas-server/src/main/java/com/yuanchu/mom/dto/DeviceConfigDtoPage.java
index 779fce1..d3cbb36 100644
--- a/cnas-server/src/main/java/com/yuanchu/mom/dto/DeviceConfigDtoPage.java
+++ b/cnas-server/src/main/java/com/yuanchu/mom/dto/DeviceConfigDtoPage.java
@@ -40,7 +40,7 @@
@ValueTableShow(8)
@ApiModelProperty(value = "妫�楠岄」瀛愰」")
- private String inspectionItemSubClass;
+ private String inspectionItemSubclass;
@ValueTableShow(9)
@ApiModelProperty(value = "鍏紡")
@@ -63,4 +63,13 @@
private String y;
private Integer id;
+
+ @ApiModelProperty(value = "妫�楠屽璞�")
+ private String sample;
+
+ @ApiModelProperty(value = "妫�楠岄」鐩甶d")
+ private Integer structureItemParameterId;
+
+ private String mdbEntrustCode;
+ private String mdbSampleCode;
}
--
Gitblit v1.9.3