From ecff6c40a1728c61c6a9a713df721b0eb31a616c Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Wed, 23 Aug 2023 13:12:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/cjl' into qa
---
screen-api/src/main/resources/mapper/SpecialDeviceMapper.xml | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/screen-api/src/main/resources/mapper/SpecialDeviceMapper.xml b/screen-api/src/main/resources/mapper/SpecialDeviceMapper.xml
index 452b9f0..8c5e135 100644
--- a/screen-api/src/main/resources/mapper/SpecialDeviceMapper.xml
+++ b/screen-api/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