From 6992aaf0587c09f7c511c1afd12e1519d91363d3 Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Thu, 14 Dec 2023 15:38:45 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/cjl' into qa
---
screen-manage/src/main/resources/mapper/ManageLogMapper.xml | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/screen-manage/src/main/resources/mapper/ManageLogMapper.xml b/screen-manage/src/main/resources/mapper/ManageLogMapper.xml
index caccc42..1077bed 100644
--- a/screen-manage/src/main/resources/mapper/ManageLogMapper.xml
+++ b/screen-manage/src/main/resources/mapper/ManageLogMapper.xml
@@ -5,9 +5,10 @@
<!-- ������������������������ -->
<resultMap id="BaseResultMap" type="com.moral.api.entity.ManageLog">
<id column="id" property="id" />
+ <result column="account_id" property="accountId" />
+ <result column="type" property="type" />
+ <result column="user_name" property="userName" />
<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