Merge remote-tracking branch 'origin/master'

linwei

2024-01-06 4252aabea22574be7936c733036af88ee989de4e

 src/main/java/org/springblade/modules/grid/mapper/GridWorkLogMapper.xml

@@ -48,7 +48,7 @@
            and jda.town_street_name like concat('%',#{gridWorkLog.townName},'%')
        </if>
        <if test="gridWorkLog.neiName!=null and gridWorkLog.neiName!=''">
            and jda.nei_name like concat('%',#{household.neiName},'%')
            and jda.nei_name like concat('%',#{gridWorkLog.neiName},'%')
        </if>
        <if test="gridWorkLog.regionCode!=null and gridWorkLog.regionCode!=''">
            and jg.community_code like concat('%',#{gridWorkLog.regionCode},'%')