Merge remote-tracking branch 'origin/master'

zhongrj

2024-04-12 dbe7fe4662e9fd130869f0c5e7ee218f62740b72

 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;

   /** 身份证号 */