Merge remote-tracking branch 'origin/master'

linwe

2024-05-28 922b12a06599bc7118c4759571b9b9fe06a2e63d

 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;

   /** 身份证号 */