From a9780c49f8cf587af26cc83d439320ad02b8668f Mon Sep 17 00:00:00 2001
From: zhaowenyu <35589726@qq.com>
Date: Wed, 15 Oct 2025 09:17:13 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev

---
 ard-work/src/main/resources/mapper/ArdServerInfoMapper.xml |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/ard-work/src/main/resources/mapper/ArdServerInfoMapper.xml b/ard-work/src/main/resources/mapper/ArdServerInfoMapper.xml
index f7022d2..a162d73 100644
--- a/ard-work/src/main/resources/mapper/ArdServerInfoMapper.xml
+++ b/ard-work/src/main/resources/mapper/ArdServerInfoMapper.xml
@@ -4,7 +4,7 @@
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ard.work.mapper.ArdServerInfoMapper">
     
-    <resultMap type="ArdServerInfo" id="ArdServerManagementResult">
+    <resultMap type="ArdServerInfo" id="ArdServerInfoResult">
         <result property="id"    column="id"    />
         <result property="serverName"    column="server_name"    />
         <result property="host"    column="host"    />

--
Gitblit v1.9.3