From 764d883b5ea3bdc06abbec548b6df0511e567978 Mon Sep 17 00:00:00 2001
From: linwe <872216996@qq.com>
Date: Tue, 03 Sep 2024 09:46:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/binlog' into binlog

---
 src/main/java/org/springblade/modules/task/entity/TaskSchoolEvenEntity.java |  137 +++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 137 insertions(+), 0 deletions(-)

diff --git a/src/main/java/org/springblade/modules/task/entity/TaskSchoolEvenEntity.java b/src/main/java/org/springblade/modules/task/entity/TaskSchoolEvenEntity.java
new file mode 100644
index 0000000..ecd301d
--- /dev/null
+++ b/src/main/java/org/springblade/modules/task/entity/TaskSchoolEvenEntity.java
@@ -0,0 +1,137 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package org.springblade.modules.task.entity;
+
+import com.baomidou.mybatisplus.annotation.*;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.EqualsAndHashCode;
+import org.springblade.core.tenant.mp.TenantEntity;
+
+import java.util.Date;
+
+/**
+ * 校园事件 实体类
+ *
+ * @author BladeX
+ * @since 2024-04-18
+ */
+@Data
+@TableName("jczz_task_school_even")
+@ApiModel(value = "TaskSchoolEven对象", description = "校园事件")
+public class TaskSchoolEvenEntity {
+
+
+
+	/** id */
+	@ApiModelProperty(value = "主键ID", example = "")
+	@TableId(value = "id", type = IdType.ASSIGN_ID)
+	private Long id;
+
+	/** 创建人 */
+	@ApiModelProperty(value = "创建人", example = "")
+	@TableField("create_user")
+	private Long createUser;
+
+	/** 图片 */
+	@ApiModelProperty(value = "图片", example = "")
+	@TableField("images")
+	private String images;
+
+	/** 描述 */
+	@ApiModelProperty(value = "描述", example = "")
+	@TableField("remark")
+	private String remark;
+
+	/** 隐患类型 */
+	@ApiModelProperty(value = "隐患类型", example = "")
+	@TableField("hidden_danger_type")
+	private String hiddenDangerType;
+
+	/** 类型 1:隐患 2:矛盾 */
+	@ApiModelProperty(value = "类型 1:隐患 2:矛盾", example = "")
+	@TableField("type")
+	private String type;
+
+	/** 是否问题 1:是 2:否 */
+	@ApiModelProperty(value = "是否问题 1:是 2:否", example = "")
+	@TableField("is_problem")
+	private String isProblem;
+
+	/** 是否处理 1:是 2:否 */
+	@ApiModelProperty(value = "是否处理 1:是 2:否", example = "")
+	@TableField("is_handle")
+	private String isHandle;
+
+	/** 是否上报 1:是 2:否 */
+	@ApiModelProperty(value = "是否上报 1:是 2:否", example = "")
+	@TableField("is_reporting")
+	private String isReporting;
+
+	/** 工作照片 */
+	@ApiModelProperty(value = "工作照片", example = "")
+	@TableField("work_image")
+	private String workImage;
+
+	/** 确认标记 1:待审核  2:审核通过  3:审核不通过 4:待处理  */
+	@ApiModelProperty(value = "确认标记 1:待审核  2:审核通过  3:审核不通过 4:待处理 ", example = "")
+	@TableField("confirm_flag")
+	private String confirmFlag;
+
+	/** 确认时间 */
+	@ApiModelProperty(value = "确认时间", example = "")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+	@TableField("confirm_time")
+	private Date confirmTime;
+
+	/** 确认用户ID */
+	@ApiModelProperty(value = "确认用户ID", example = "")
+	@TableField("confirm_user_id")
+	private Long confirmUserId;
+
+	/** 确认用户ID */
+	@ApiModelProperty(value = "确认用户ID", example = "")
+	@TableField("confirm_user_name")
+	private String confirmUserName;
+
+	/** 确认意见 */
+	@ApiModelProperty(value = "确认意见", example = "")
+	@TableField("confirm_notion")
+	private String confirmNotion;
+	/** 地址编码 */
+	@ApiModelProperty(value = "地址编码", example = "")
+	@TableField("house_code")
+	private String houseCode;
+
+	/** 创建时间 */
+	@ApiModelProperty(value = "创建时间", example = "")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+	@TableField(value = "create_time",fill = FieldFill.INSERT)
+	private Date createTime;
+
+	/** 更新时间 */
+	@ApiModelProperty(value = "更新时间", example = "")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+	@TableField(value = "update_time",fill = FieldFill.UPDATE)
+	private Date updateTime;
+
+	@ApiModelProperty(value = "处理描述", example = "")
+	@TableField("handle_remark")
+	private String handleRemark;
+}

--
Gitblit v1.9.3