From a1e19c7466cce45b5bb360e38ab7c7c1753986f2 Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期二, 13 一月 2026 15:03:40 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_ztns' into dev_ztns

---
 cnas-device/src/main/java/com/ruoyi/device/dto/DeviceCollectionDto.java |    8 ++++++++
 1 files changed, 8 insertions(+), 0 deletions(-)

diff --git a/cnas-device/src/main/java/com/ruoyi/device/dto/DeviceCollectionDto.java b/cnas-device/src/main/java/com/ruoyi/device/dto/DeviceCollectionDto.java
index 6d84b56..8109ec0 100644
--- a/cnas-device/src/main/java/com/ruoyi/device/dto/DeviceCollectionDto.java
+++ b/cnas-device/src/main/java/com/ruoyi/device/dto/DeviceCollectionDto.java
@@ -25,10 +25,18 @@
 
     @ApiModelProperty(value = "閲囬泦鐨勬楠岄」id")
     private List<Integer> itemIds;
+
     //鏁版嵁搴撶敤鎴峰悕
     @ApiModelProperty(value = "鏁版嵁搴撶敤鎴峰悕")
     private String dbUserName;
+
     //鏁版嵁搴撳瘑鐮�
     @ApiModelProperty(value = "鏁版嵁搴撳瘑鐮�")
     private String dbPassword;
+
+    @ApiModelProperty(value = "鏁版嵁搴撹〃")
+    private String dbTable;
+
+    @ApiModelProperty(value = "鎵规鍙�")
+    private String lotBatchNo;
 }

--
Gitblit v1.9.3