Merge remote-tracking branch 'origin/master'

lin

2024-04-03 2dad58eb94e729b2efd51ebac7fcc773aca80ded

 src/main/java/org/springblade/modules/task/entity/TaskEntity.java

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