From f26786e162241b6b803ada6d19d80e1f5fb615e5 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Mon, 16 Oct 2023 09:36:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wb' into qa

---
 screen-manage/src/main/resources/mapper/ManageLogMapper.xml |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/screen-manage/src/main/resources/mapper/ManageLogMapper.xml b/screen-manage/src/main/resources/mapper/ManageLogMapper.xml
index 708e835..1077bed 100644
--- a/screen-manage/src/main/resources/mapper/ManageLogMapper.xml
+++ b/screen-manage/src/main/resources/mapper/ManageLogMapper.xml
@@ -6,6 +6,7 @@
         <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="ip" property="ip" />

--
Gitblit v1.8.0