From c4e2c196aad8af656d94bc47e9f1a80bc504b5d7 Mon Sep 17 00:00:00 2001
From: lin <sbla5888@163.com>
Date: Thu, 14 Mar 2024 18:15:29 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/main/java/org/springblade/modules/task/entity/TaskReportForRepairsEntity.java |   63 +++++++++++++++++++++++++++++++
 1 files changed, 62 insertions(+), 1 deletions(-)

diff --git a/src/main/java/org/springblade/modules/task/entity/TaskReportForRepairsEntity.java b/src/main/java/org/springblade/modules/task/entity/TaskReportForRepairsEntity.java
index 2f9d726..8775ed7 100644
--- a/src/main/java/org/springblade/modules/task/entity/TaskReportForRepairsEntity.java
+++ b/src/main/java/org/springblade/modules/task/entity/TaskReportForRepairsEntity.java
@@ -17,6 +17,9 @@
 package org.springblade.modules.task.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import lombok.Data;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -24,7 +27,7 @@
 import lombok.EqualsAndHashCode;
 import org.springblade.core.mp.base.BaseEntity;
 import org.springblade.core.tenant.mp.TenantEntity;
-import sun.rmi.runtime.Log;
+import org.springframework.format.annotation.DateTimeFormat;
 
 /**
  * 报事报修任务表 实体类
@@ -51,6 +54,12 @@
 	private Long taskId;
 
 	/**
+	 * 门牌地址编码
+	 */
+	@ApiModelProperty(value = "门牌地址编码")
+	private String addressCode;
+
+	/**
 	 * 姓名
 	 */
 	@ApiModelProperty(value = "姓名")
@@ -70,4 +79,56 @@
 	 */
 	@ApiModelProperty(value = "图片路径")
 	private String imageUrls;
+
+	/**
+	 * 确认用户ID
+	 */
+	@ApiModelProperty(value = "确认用户ID")
+	@JsonSerialize(using = ToStringSerializer.class)
+	private Long confirmUserId;
+	/**
+	 * 确认时间
+	 */
+	@ApiModelProperty(value = "确认时间")
+	@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+	private Date confirmTime;
+	/**
+	 * 确认标记  1：待处理  2：处理中  3：已处理
+	 */
+	@ApiModelProperty(value = "确认标记  1：待处理  2：处理中  3：已处理")
+	private Integer confirmFlag;
+	/**
+	 * 确认意见
+	 */
+	@ApiModelProperty(value = "确认意见")
+	private String confirmNotion;
+	/**
+	 * 经度
+	 */
+	@ApiModelProperty(value = "经度")
+	private String lng;
+	/**
+	 * 纬度
+	 */
+	@ApiModelProperty(value = "纬度")
+	private String lat;
+	/**
+	 * 事发地地址
+	 */
+	@ApiModelProperty(value = "事发地地址")
+	private String address;
+
+
+	/**
+	 * 临时用  1：已查看  2：未查看
+	 */
+	@ApiModelProperty(value = "临时用  1：已查看  2：未查看")
+	private Integer viewType;
+
+	/**
+	 * 1：房屋 2：场所
+	 */
+	@ApiModelProperty(value = "1：房屋 2：场所")
+	private Integer houseFlag;
 }

--
Gitblit v1.9.3