From 4e8a1c02b45f72f6377603778e8c8746ed82f374 Mon Sep 17 00:00:00 2001
From: zhaowenyu <35589726@qq.com>
Date: Tue, 06 Jan 2026 10:04:33 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev

---
 ard-framework/src/main/java/com/ard/framework/web/domain/server/Mem.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/ard-framework/src/main/java/com/ard/framework/web/domain/server/Mem.java b/ard-framework/src/main/java/com/ard/framework/web/domain/server/Mem.java
index 2a330f7..0b61b60 100644
--- a/ard-framework/src/main/java/com/ard/framework/web/domain/server/Mem.java
+++ b/ard-framework/src/main/java/com/ard/framework/web/domain/server/Mem.java
@@ -5,7 +5,7 @@
 /**
  * 內存相关信息
  * 
- * @author ruoyi
+ * @author ard
  */
 public class Mem
 {

--
Gitblit v1.9.3