From 6ebf2b2a84b903f3600238dd084b3ae9ee4d6d3b Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Fri, 16 Apr 2021 17:33:07 +0800
Subject: [PATCH] Merge branch 'dev' of http://blit.7drlb.com:8888/r/moral into dev

---
 screen-api/src/main/resources/mapper/ManageLogMapper.xml |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/screen-api/src/main/resources/mapper/ManageLogMapper.xml b/screen-api/src/main/resources/mapper/ManageLogMapper.xml
index caccc42..a688e65 100644
--- a/screen-api/src/main/resources/mapper/ManageLogMapper.xml
+++ b/screen-api/src/main/resources/mapper/ManageLogMapper.xml
@@ -5,9 +5,11 @@
         <!-- ������������������������ -->
         <resultMap id="BaseResultMap" type="com.moral.api.entity.ManageLog">
                     <id column="id" property="id" />
+                    <result column="account_id" property="accountId" />
+                    <result column="account" property="account" />
+                    <result column="user_name" property="userName" />
+                    <result column="type" property="type" />
                     <result column="content" property="content" />
-                    <result column="organization_id" property="organizationId" />
-                    <result column="operate_id" property="operateId" />
                     <result column="ip" property="ip" />
                     <result column="create_time" property="createTime" />
         </resultMap>

--
Gitblit v1.8.0