From 9895be644e5f4d8b03170fcdfedb9fc57d90f2d8 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期三, 31 七月 2024 18:04:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 cnas-server/src/main/java/com/yuanchu/mom/dto/DeviceConfigDtoPage.java |    9 +++++++++
 1 files changed, 9 insertions(+), 0 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 311ff58..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
@@ -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