Merge remote-tracking branch 'origin/master'

linwei

2024-01-02 9cc50d2e2c3fcfff3c6b95c09806d3881a97c5ff

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

@@ -158,6 +158,6 @@
                LEFT JOIN jczz_grid jg ON jgm.grid_id = jg.id
                LEFT JOIN jczz_grid_range jgr ON jgr.grid_id = jg.id
        WHERE
            jgr.house_code = #{houseCode}
            jgr.house_code = #{houseCode}  and bu.is_deleted = 0
    </select>
</mapper>