Merge remote-tracking branch 'origin/master'

lin

2024-03-20 70a29ae28b85643e00a4b7fbf111a95646a24dc2

 src/main/java/org/springblade/modules/article/entity/Article.java

@@ -105,13 +105,35 @@
   @TableField("create_user")
   private Long createUser;

   /** 是否删除 0：否  1：是 */
   /**
    * 是否删除 0：否  1：是
    */
   @ApiModelProperty(value = "是否删除 0：否  1：是", example = "")
   @TableField("is_deleted")
   private Integer isDeleted;

   /** 资讯范围 */
   /**
    * 资讯范围
    */
   @ApiModelProperty(value = "资讯范围", example = "")
   @TableField("article_range")
   private String articleRange;

   /**
    * 楼栋
    */
   @ApiModelProperty(value = "楼栋", example = "")
   @TableField("building")
   private String building;

   /**
    * 单元
    */
   @ApiModelProperty(value = "单元", example = "")
   @TableField("unit")
   private String unit;

   @ApiModelProperty(value = "小区id", example = "")
   @TableField("district_id")
   private String districtId;
}