Merge remote-tracking branch 'origin/master'

zhongrj

2023-11-09 9e754d4c91e41b02a1e39d7ca709ec9491558da2

 src/main/java/org/springblade/modules/task/mapper/TaskHotelReportingMapper.xml

@@ -37,6 +37,9 @@

    <select id="selectTaskHotelReportingPage" resultMap="taskHotelReportingResultMap">
        select * from jczz_task_hotel_reporting where is_deleted = 0
        <if test="vo.checkUserId != null and vo.checkUserId != ''">
            AND check_user_id = #{vo.checkUserId}
        </if>
    </select>