Merge remote-tracking branch 'origin/master'

zhongrj

2024-04-12 5e38565331498231eefafe66265052f6c215d54b

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

@@ -57,9 +57,9 @@
   @ApiModelProperty(value = "角色")
   private Integer roleType;
   /**
    * 与角色关系
    * 与业主关系
    */
   @ApiModelProperty(value = "与角色关系")
   @ApiModelProperty(value = "与业主关系")
   private Integer relationship;

   /**