Merge remote-tracking branch 'origin/master'

linwe

2023-12-21 224e0bbfc8d24785fea2e0160c36d7a8f6cd7269

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

@@ -22,7 +22,8 @@
            color,
            remark,
            user_id,
            lable_type
            lable_type,
            household_id
        from
            jczz_user_house_label
    </sql>