Merge remote-tracking branch 'origin/master'

lin

2024-04-03 ca47329a14f7fde5e945ca5ed1a8be7090a62fe5

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

@@ -186,6 +186,7 @@
   /** 0否 1是 */
   @ApiModelProperty(value = "0否 1是", example = "")
   @TableField("is_deleted")
   @TableLogic
   private Integer isDeleted;

   /** 身份证号 */