Merge remote-tracking branch 'origin/master'

linwe

2023-11-28 038f3e14174a00a111d489d5cf1b724275fe33da

 src/main/java/org/springblade/modules/house/entity/UserHouseLabelEntity.java

@@ -83,6 +83,6 @@
   /** 住户id */
   @ApiModelProperty(value = "住户id", example = "")
   @TableField("household_id")
   private Long householdId;
   private Integer householdId;

}