From 5586964c3e63f95c9e460a6a3d85d7dca408e096 Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Mon, 18 Oct 2021 14:35:39 +0800
Subject: [PATCH] Merge branch 'dev' of http://blit.7drlb.com:8888/r/moral into dev

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

diff --git a/screen-api/src/main/resources/mapper/DeviceMapper.xml b/screen-api/src/main/resources/mapper/DeviceMapper.xml
index 5c54941..ce3522f 100644
--- a/screen-api/src/main/resources/mapper/DeviceMapper.xml
+++ b/screen-api/src/main/resources/mapper/DeviceMapper.xml
@@ -14,6 +14,7 @@
         <result column="operate_ids" property="operateIds"/>
         <result column="monitor_point_id" property="monitorPointId"/>
         <result column="organization_id" property="organizationId"/>
+        <result column="guid" property="guid"/>
         <result column="device_version_id" property="deviceVersionId"/>
         <result column="profession" property="profession"/>
         <result column="tech" property="tech"/>

--
Gitblit v1.8.0