Merge remote-tracking branch 'origin/master'

linwei

2024-01-10 f8d1143ef6cfbbaaebe3b25efa24ee19c9ea61c8

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

@@ -109,6 +109,12 @@
   private String remark;

   /**
    * 用户id
    */
   @ApiModelProperty(value = "用户id")
   private String userId;

   /**
    * 创建人
    */
   @JsonSerialize(using = ToStringSerializer.class)