Merge remote-tracking branch 'origin/master'

lin

2024-03-25 27276ad478ff1e5f2f3b2ce3dac70ec83296fe74

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

@@ -237,4 +237,8 @@
   @ApiModelProperty("是否已删除")
   private Integer isDeleted;

   @ApiModelProperty("事件类型：0 ：旅馆 1：九小场所")
   @TableField("event_type")
   private Integer eventType;

}