From 27e6bc3df3e39e0d0b147b155a89ad6837ea972b Mon Sep 17 00:00:00 2001
From: cjl <909710561@qq.com>
Date: Mon, 06 Jan 2025 09:19:24 +0800
Subject: [PATCH] Merge branch 'cjl' into dev

---
 screen-api/src/main/resources/mapper/SpecialDeviceHistoryMapper.xml |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/screen-api/src/main/resources/mapper/SpecialDeviceHistoryMapper.xml b/screen-api/src/main/resources/mapper/SpecialDeviceHistoryMapper.xml
index a2b05bb..987bbd5 100644
--- a/screen-api/src/main/resources/mapper/SpecialDeviceHistoryMapper.xml
+++ b/screen-api/src/main/resources/mapper/SpecialDeviceHistoryMapper.xml
@@ -7,6 +7,7 @@
         <id column="id" property="id"/>
         <result column="name" property="name"/>
         <result column="mac" property="mac"/>
+        <result column="guid" property="guid"/>
         <result column="operate_ids" property="operateIds"/>
         <result column="organization_id" property="organizationId"/>
         <result column="device_version_id" property="deviceVersionId"/>

--
Gitblit v1.8.0