Merge remote-tracking branch 'origin/master'

linwei

2024-01-02 9cc50d2e2c3fcfff3c6b95c09806d3881a97c5ff

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

@@ -180,6 +180,9 @@
        <if test="vo.status != null">
            AND jtrfr.status = #{vo.status}
        </if>
        <if test="vo.addressCode != null">
            AND jtrfr.address_code = #{vo.addressCode}
        </if>
        <if test="vo.viewType != null">
            AND jtrfr.view_type = #{vo.viewType}
        </if>