From f342a0d88b2a7168f794d0cf545d16a3138acb6d Mon Sep 17 00:00:00 2001
From: wuqiping <wuqiping@qq.com>
Date: Wed, 09 Jun 2021 15:55:33 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
screen-manage/src/main/resources/mapper/ManageLogMapper.xml | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/screen-manage/src/main/resources/mapper/ManageLogMapper.xml b/screen-manage/src/main/resources/mapper/ManageLogMapper.xml
index bb54f7f..1077bed 100644
--- a/screen-manage/src/main/resources/mapper/ManageLogMapper.xml
+++ b/screen-manage/src/main/resources/mapper/ManageLogMapper.xml
@@ -5,10 +5,10 @@
<!-- ������������������������ -->
<resultMap id="BaseResultMap" type="com.moral.api.entity.ManageLog">
<id column="id" property="id" />
- <result column="type" property="type" />
- <result column="module" property="module" />
- <result column="content" property="content" />
<result column="account_id" property="accountId" />
+ <result column="type" property="type" />
+ <result column="user_name" property="userName" />
+ <result column="content" property="content" />
<result column="ip" property="ip" />
<result column="create_time" property="createTime" />
</resultMap>
--
Gitblit v1.8.0