From 80ea05da0c43c2ae14e2d8cf8d284d96d9a8f1f5 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期二, 06 八月 2024 19:08:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 cnas-server/src/main/java/com/yuanchu/mom/dto/DeviceConfigDtoPage.java |   10 ++++++++--
 1 files changed, 8 insertions(+), 2 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 d3cbb36..dfe8c52 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
@@ -70,6 +70,12 @@
     @ApiModelProperty(value = "妫�楠岄」鐩甶d")
     private Integer structureItemParameterId;
 
-    private String mdbEntrustCode;
-    private String mdbSampleCode;
+    @ApiModelProperty("鏁伴噰-濮旀墭瀛楁")
+    private String entrustCode;
+
+    @ApiModelProperty("鏁伴噰-鏍峰搧瀛楁")
+    private String sampleCode;
+
+    @ApiModelProperty("鏁伴噰-db锛宮db鏂囦欢鍚嶇О")
+    private String dbFileName;
 }

--
Gitblit v1.9.3