Merge remote-tracking branch 'origin/master'

lin

2024-03-25 27276ad478ff1e5f2f3b2ce3dac70ec83296fe74

 src/main/java/org/springblade/modules/system/mapper/UserMapper.xml

@@ -236,9 +236,8 @@
    <select id="getUserInfoByDistrictIds" resultType="org.springblade.modules.house.vo.HouseholdVO">

        SELECT
        jh.building,
        jh.unit,
        bu.id userId,
        jhe.house_name address,
        bu.id,
        bu.tenant_id,
        bu.code,
        bu.user_type,