From 27e6bc3df3e39e0d0b147b155a89ad6837ea972b Mon Sep 17 00:00:00 2001 From: cjl <909710561@qq.com> Date: Mon, 06 Jan 2025 09:19:24 +0800 Subject: [PATCH] Merge branch 'cjl' 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