From 41be4062287acd5bee79875fd28c4c0af18d599c Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Sat, 27 Jan 2024 15:38:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/springblade/modules/task/mapper/TaskHotelReportingMapper.xml | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/src/main/java/org/springblade/modules/task/mapper/TaskHotelReportingMapper.xml b/src/main/java/org/springblade/modules/task/mapper/TaskHotelReportingMapper.xml
index dfffaba..c65971e 100644
--- a/src/main/java/org/springblade/modules/task/mapper/TaskHotelReportingMapper.xml
+++ b/src/main/java/org/springblade/modules/task/mapper/TaskHotelReportingMapper.xml
@@ -30,6 +30,7 @@
<result column="sc_flag" property="scFlag"/>
<result column="confirm_notion" property="confirmNotion"/>
<result column="confirm_flag" property="confirmFlag"/>
+ <result column="event_type" property="eventType"/>
</resultMap>
@@ -64,7 +65,8 @@
create_time,
update_time,
create_user,
- update_user
+ update_user,
+ event_type
from jczz_task_hotel_reporting where is_deleted = 0
<if test="taskHotelReporting.checkUserId != null and taskHotelReporting.checkUserId != ''">
AND check_user_id = #{taskHotelReporting.checkUserId}
--
Gitblit v1.9.3