From 09c297c75f036f017dedfb163e338c6c427477d5 Mon Sep 17 00:00:00 2001
From: zhuo <2089219845@qq.com>
Date: 星期一, 21 四月 2025 08:55:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_ztzb' into dev_ztzb
---
cnas-device/src/main/java/com/ruoyi/device/pojo/DeviceImpower.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/cnas-device/src/main/java/com/ruoyi/device/pojo/DeviceImpower.java b/cnas-device/src/main/java/com/ruoyi/device/pojo/DeviceImpower.java
index dc8b6d6..5851883 100644
--- a/cnas-device/src/main/java/com/ruoyi/device/pojo/DeviceImpower.java
+++ b/cnas-device/src/main/java/com/ruoyi/device/pojo/DeviceImpower.java
@@ -14,7 +14,7 @@
/**
* <p>
- * 璁惧閲忓�兼函婧愯鍒掕〃
+ * 璁惧浣跨敤鎺堟潈琛�
* </p>
*
* @author
@@ -23,7 +23,7 @@
@Getter
@Setter
@TableName("device_impower")
-@ApiModel(value = "DeviceImpower瀵硅薄", description = "璁惧閲忓�兼函婧愯鍒掕〃")
+@ApiModel(value = "DeviceImpower瀵硅薄", description = "璁惧浣跨敤鎺堟潈琛�")
public class DeviceImpower implements Serializable {
@ApiModelProperty("鎺堟潈id")
--
Gitblit v1.9.3