Merge remote-tracking branch 'origin/master'

lin

2024-03-25 9f8f9d13c42ca8cdccbf351069082a5fdccef2e4

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

@@ -74,6 +74,9 @@
        left join jczz_gridman jgm on jgm.grid_id = jg.id and jgm.is_deleted = 0
        where 1=1
        and jgm.user_id = #{userId}
        <if test="addressCode!=null and addressCode!=''">
            and jgr.house_code = #{addressCode}
        </if>
    </select>

    <!--判断该小区点在哪个派出所-->