Merge remote-tracking branch 'origin/master'

lin

2024-03-25 9f8f9d13c42ca8cdccbf351069082a5fdccef2e4

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

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