From 2137911cd6a0a20723356f3c0678cbf3556e7d7d Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Fri, 29 Dec 2023 18:17:01 +0800
Subject: [PATCH] bug修复
---
src/main/java/org/springblade/modules/place/entity/PlaceExtEntity.java | 46 ++++++++++++++++++++++++++++++++++++----------
1 files changed, 36 insertions(+), 10 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 e8ff316..993abcb 100644
--- a/src/main/java/org/springblade/modules/place/entity/PlaceExtEntity.java
+++ b/src/main/java/org/springblade/modules/place/entity/PlaceExtEntity.java
@@ -16,22 +16,17 @@
*/
package org.springblade.modules.place.entity;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableLogic;
-import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.*;
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;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
import java.io.Serializable;
import java.util.Date;
-import lombok.EqualsAndHashCode;
-import org.springblade.core.tenant.mp.TenantEntity;
-import org.springframework.format.annotation.DateTimeFormat;
/**
* 场所详情表 实体类
@@ -43,6 +38,7 @@
@TableName("jczz_place_ext")
@ApiModel(value = "PlaceExt对象", description = "场所详情表")
public class PlaceExtEntity implements Serializable {
+ private static final long serialVersionUID = 1L;
/**
* 主键
@@ -51,6 +47,12 @@
@ApiModelProperty("主键id")
@TableId(value = "id", type = IdType.ASSIGN_ID)
private Long id;
+
+ /**
+ * 任务id
+ */
+ @ApiModelProperty(value = "任务id")
+ private Long taskId;
/**
* 场所ID
@@ -66,7 +68,7 @@
* 场所位置
*/
@ApiModelProperty(value = "场所位置")
- private String localtion;
+ private String location;
/**
* 法人信息
*/
@@ -84,6 +86,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 = "确认标记 0:待完善 1：待审核 2：审核通过 3：审核不通过")
+ private Integer confirmFlag;
+ /**
+ * 确认意见
+ */
+ @ApiModelProperty(value = "确认意见")
+ private String confirmNotion;
+
+ /**
* 创建人
*/
@JsonSerialize(using = ToStringSerializer.class)
@@ -96,6 +122,7 @@
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@ApiModelProperty("创建时间")
+ @TableField(fill = FieldFill.INSERT)
private Date createTime;
/**
@@ -119,5 +146,4 @@
@TableLogic
@ApiModelProperty("是否已删除 0:否 1:是")
private Integer isDeleted;
-
}
--
Gitblit v1.9.3