Merge remote-tracking branch 'origin/master'

lin

2024-03-25 9f8f9d13c42ca8cdccbf351069082a5fdccef2e4

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

@@ -33,6 +33,8 @@
            <if test="residen.minors!=null and residen.minors ==1">
                and TIMESTAMPDIFF(year, substring(jtrpa.id_card, 7, 8), now()) &gt;= 18
            </if>
            <if test="residen.communityCode != null  and residen.communityCode != ''"> and jg.community_code = #{residen.communityCode}</if>

            <if test="residen.id != null ">and jtrpa.id = #{residen.id}</if>
            <if test="residen.name != null  and residen.name != ''">and jtrpa.name like CONCAT('%',#{residen.name},'%')</if>
            <if test="residen.phone != null  and residen.phone != ''">and jtrpa.phone like CONCAT('%',#{residen.phone},'%')</if>