From 771d591cb1ef40344f6c84b5c30cfd8ffd8e2f14 Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Fri, 23 Apr 2021 14:49:43 +0800
Subject: [PATCH] Merge branch 'dev' of http://blit.7drlb.com:8888/r/moral into dev

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

diff --git a/screen-manage/src/main/resources/mapper/UserLogMapper.xml b/screen-manage/src/main/resources/mapper/UserLogMapper.xml
index 52f730a..5895e92 100644
--- a/screen-manage/src/main/resources/mapper/UserLogMapper.xml
+++ b/screen-manage/src/main/resources/mapper/UserLogMapper.xml
@@ -5,6 +5,7 @@
         <!-- ������������������������ -->
         <resultMap id="BaseResultMap" type="com.moral.api.entity.UserLog">
                     <id column="id" property="id" />
+                    <result column="type" property="type" />
                     <result column="content" property="content" />
                     <result column="organization_id" property="organizationId" />
                     <result column="operate_id" property="operateId" />

--
Gitblit v1.8.0