Merge remote-tracking branch 'origin/master'

lin

2024-03-25 27276ad478ff1e5f2f3b2ce3dac70ec83296fe74

 src/main/java/org/springblade/modules/property/entity/PropertyCompanyDistrictEntity.java

@@ -59,7 +59,7 @@
   @ApiModelProperty(value = "小区id")
   private String districtId;
   /**
    * 负责人姓名
    * 负责人id
    */
   @ApiModelProperty(value = "负责人id")
   private String principal;