Merge remote-tracking branch 'origin/master'

linwei

2024-01-02 31b6aefacbee9dde61be6afcb7c6dbbf7c6baa7d

 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>