Merge remote-tracking branch 'origin/master'

lin

2024-03-21 0e81a8b3ba0376f39a086f655d83ecd14614ced3

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

@@ -49,7 +49,7 @@

            <if test="isAdministrator==2">
                <!-- 网格员及其他 -->
                <if test="residen.roleType ==null">
                <if test="residen.roleType ==null and residen.roleName !='inhabitant'">
                    <choose>
                        <when test="regionChildCodesList !=null and regionChildCodesList.size()>0">
                            and (