From 2a4a9ef52b0d76efb9712fd8d4268f658546f99f Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Thu, 19 Oct 2023 16:31:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/cjl' into qa
---
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