Merge remote-tracking branch 'origin/master'

linwe

2023-11-30 4ddd3e7456b2afe79cccf7c9f5960ea2023231f1

 src/main/java/org/springblade/modules/house/mapper/HouseholdMapper.xml

@@ -117,7 +117,7 @@
    </select>

    <!--查询房屋集合信息-->
    <select id="selectHouseNodeList" resultType="org.springblade.common.node.TreeNode" >
    <select id="selectHouseNodeList" resultType="org.springblade.common.node.TreeStringNode" >
        select jh.house_code    as id,
               jh.house_code    as houseCode,
               jda.address_name as name,