Merge remote-tracking branch 'origin/master'

lin

2024-03-25 27276ad478ff1e5f2f3b2ce3dac70ec83296fe74

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

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