From 5a7b9382114d37b7533026c62bf99b9dc4ef3a3d Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Fri, 29 Dec 2023 18:30:03 +0800
Subject: [PATCH] 场所数据操作去除任务绑定，新增初始数据处理，住户查询修改
---
src/main/java/org/springblade/modules/place/entity/PlaceExtEntity.java | 31 ++++++++++++++++---------------
1 files changed, 16 insertions(+), 15 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 993abcb..f906ccb 100644
--- a/src/main/java/org/springblade/modules/place/entity/PlaceExtEntity.java
+++ b/src/main/java/org/springblade/modules/place/entity/PlaceExtEntity.java
@@ -20,13 +20,15 @@
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;
/**
* 场所详情表 实体类
@@ -47,12 +49,12 @@
@ApiModelProperty("主键id")
@TableId(value = "id", type = IdType.ASSIGN_ID)
private Long id;
-
- /**
- * 任务id
- */
- @ApiModelProperty(value = "任务id")
- private Long taskId;
+//
+// /**
+// * 任务id
+// */
+// @ApiModelProperty(value = "任务id")
+// private Long taskId;
/**
* 场所ID
@@ -64,11 +66,7 @@
*/
@ApiModelProperty(value = "营业执照图片URLS")
private String imageUrls;
- /**
- * 场所位置
- */
- @ApiModelProperty(value = "场所位置")
- private String location;
+
/**
* 法人信息
*/
@@ -99,9 +97,9 @@
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date confirmTime;
/**
- * 确认标记 1：待审核 2：审核通过 3：审核不通过
+ * 确认标记 1：待审核 2：审核通过 3：审核不通过 4:待完善（地址表数据，无场所负责人）
*/
- @ApiModelProperty(value = "确认标记 0:待完善 1：待审核 2：审核通过 3：审核不通过")
+ @ApiModelProperty(value = "确认标记 1：待审核 2：审核通过 3：审核不通过 4:待完善")
private Integer confirmFlag;
/**
* 确认意见
@@ -114,6 +112,7 @@
*/
@JsonSerialize(using = ToStringSerializer.class)
@ApiModelProperty("创建人")
+ @TableField(fill = FieldFill.INSERT)
private Long createUser;
/**
@@ -130,6 +129,7 @@
*/
@JsonSerialize(using = ToStringSerializer.class)
@ApiModelProperty("更新人")
+ @TableField(fill = FieldFill.INSERT_UPDATE)
private Long updateUser;
/**
@@ -138,6 +138,7 @@
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@ApiModelProperty("更新时间")
+ @TableField(fill = FieldFill.INSERT_UPDATE)
private Date updateTime;
/**
--
Gitblit v1.9.3