From 6fb742d463ecac5e7d4934d7248a40979edc3626 Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期一, 21 七月 2025 14:33:25 +0800
Subject: [PATCH] Merge branch 'dev_ztns' into dev_ywx_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