From 38365ee0424879f654ef3b87031c537d7b27b8e3 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Wed, 08 Nov 2023 14:41:24 +0800
Subject: [PATCH] Merge branch 'dev' of http://blit.7drlb.com:8888/r/moral into wb

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

diff --git a/screen-manage/src/main/resources/mapper/SpecialDeviceMapper.xml b/screen-manage/src/main/resources/mapper/SpecialDeviceMapper.xml
index a422955..f4d754f 100644
--- a/screen-manage/src/main/resources/mapper/SpecialDeviceMapper.xml
+++ b/screen-manage/src/main/resources/mapper/SpecialDeviceMapper.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