Merge remote-tracking branch 'origin/master'

lin

2024-03-20 55f7fe8a1822019840a1580b05ed26ab914d3400

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

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