From 58972583c9f82237068c12a8d8b92e85e8af3c55 Mon Sep 17 00:00:00 2001
From: chenxi <276999030@qq.com>
Date: Sat, 27 May 2023 16:12:16 +0800
Subject: [PATCH] Merge branch 'dev' of http://blit.7drlb.com:8888/r/moral 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