From fe2d7c404c69700404814e18a70d5e606916486b Mon Sep 17 00:00:00 2001
From: maven <2163098428@qq.com>
Date: 星期四, 24 七月 2025 15:04:12 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_ztns' into dev_ztns

---
 cnas-device/src/main/java/com/ruoyi/device/pojo/Device.java |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)

diff --git a/cnas-device/src/main/java/com/ruoyi/device/pojo/Device.java b/cnas-device/src/main/java/com/ruoyi/device/pojo/Device.java
index d403f5a..a3dbdc8 100644
--- a/cnas-device/src/main/java/com/ruoyi/device/pojo/Device.java
+++ b/cnas-device/src/main/java/com/ruoyi/device/pojo/Device.java
@@ -134,5 +134,10 @@
 
     @ApiModelProperty("浜у湴")
     private String origin;
-
+    //鏁版嵁搴撶敤鎴峰悕
+    @ApiModelProperty("鏁版嵁搴撶敤鎴峰悕")
+    private String dbUserName;
+    //鏁版嵁搴撳瘑鐮�
+    @ApiModelProperty("鏁版嵁搴撳瘑鐮�")
+    private String dbPassword;
 }

--
Gitblit v1.9.3