From 7029a780a1738bffdb6b00fa94d7b845f9444a5d Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Fri, 07 Jul 2023 08:31:23 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/qa' into cjl
---
screen-manage/src/main/resources/mapper/UserLogMapper.xml | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/screen-manage/src/main/resources/mapper/UserLogMapper.xml b/screen-manage/src/main/resources/mapper/UserLogMapper.xml
index 52f730a..5895e92 100644
--- a/screen-manage/src/main/resources/mapper/UserLogMapper.xml
+++ b/screen-manage/src/main/resources/mapper/UserLogMapper.xml
@@ -5,6 +5,7 @@
<!-- ������������������������ -->
<resultMap id="BaseResultMap" type="com.moral.api.entity.UserLog">
<id column="id" property="id" />
+ <result column="type" property="type" />
<result column="content" property="content" />
<result column="organization_id" property="organizationId" />
<result column="operate_id" property="operateId" />
--
Gitblit v1.8.0