From 365b5ad817c9c8a2992d505aa39eccfa2be0460e Mon Sep 17 00:00:00 2001
From: linwe <872216996@qq.com>
Date: Thu, 09 Nov 2023 09:39:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/main/java/org/springblade/modules/place/entity/PlaceExtEntity.java |   30 ++++++++++++++++++++++++++++++
 1 files changed, 30 insertions(+), 0 deletions(-)

diff --git a/src/main/java/org/springblade/modules/place/entity/PlaceExtEntity.java b/src/main/java/org/springblade/modules/place/entity/PlaceExtEntity.java
index 64bccd8..c785e08 100644
--- a/src/main/java/org/springblade/modules/place/entity/PlaceExtEntity.java
+++ b/src/main/java/org/springblade/modules/place/entity/PlaceExtEntity.java
@@ -54,6 +54,12 @@
 	private Long id;
 
 	/**
+	 * 任务id
+	 */
+	@ApiModelProperty(value = "任务id")
+	private Long taskId;
+
+	/**
 	 * 场所ID
 	 */
 	@ApiModelProperty(value = "场所ID")
@@ -85,6 +91,30 @@
 	private String planImageUrls;
 
 	/**
+	 * 确认用户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;
+
+	/**
 	 * 创建人
 	 */
 	@JsonSerialize(using = ToStringSerializer.class)

--
Gitblit v1.9.3