From 8e41bd549e3bf0dab2f713ad1c967c4e673c0e5a Mon Sep 17 00:00:00 2001
From: chen_xi <276999030@qq.com>
Date: Thu, 17 Nov 2022 09:27:15 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' 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