Merge remote-tracking branch 'origin/master'

lin

2024-03-14 c4e2c196aad8af656d94bc47e9f1a80bc504b5d7

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

@@ -133,7 +133,7 @@
   /**
    * 是否删除
    */
   @TableLogic
   // @TableLogic
   @ApiModelProperty("是否已删除 0:否  1:是")
   private Integer isDeleted;
}