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/DeviceInstruction.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/cnas-device/src/main/java/com/ruoyi/device/pojo/DeviceInstruction.java b/cnas-device/src/main/java/com/ruoyi/device/pojo/DeviceInstruction.java
index 5a4f845..b4752c8 100644
--- a/cnas-device/src/main/java/com/ruoyi/device/pojo/DeviceInstruction.java
+++ b/cnas-device/src/main/java/com/ruoyi/device/pojo/DeviceInstruction.java
@@ -14,7 +14,7 @@
  * 浣滀笟鎸囧涔︽坊鍔犲彈鎺ф枃浠惰〃
  * </p>
  *
- * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @author 
  * @since 2024-12-04 10:29:18
  */
 @Getter

--
Gitblit v1.9.3