Merge remote-tracking branch 'origin/master'

lin

2024-03-23 b3a0e5051c2923b5e12b059b6634aa9bd12db59b

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

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

    <select id="selectTaskBailReportingEventPage" resultMap="taskBailReportingEventResultMap">
        select * from jczz_task_bail_reporting_event where is_deleted = 0
        <if test="taskBailReportingEvent.checkUserId != null and taskBailReportingEvent.checkUserId != ''">
            AND check_user_id = #{taskBailReportingEvent.checkUserId}
        </if>
    </select>