From 55d677758efadb6d42e6d4e595cecc2c50c20d5a Mon Sep 17 00:00:00 2001
From: linwe <872216996@qq.com>
Date: Sat, 23 Dec 2023 17:19:12 +0800
Subject: [PATCH] bug修复
---
src/main/java/org/springblade/modules/place/entity/PlaceEntity.java | 55 ++++++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 46 insertions(+), 9 deletions(-)
diff --git a/src/main/java/org/springblade/modules/place/entity/PlaceEntity.java b/src/main/java/org/springblade/modules/place/entity/PlaceEntity.java
index 879417f..b8cef89 100644
--- a/src/main/java/org/springblade/modules/place/entity/PlaceEntity.java
+++ b/src/main/java/org/springblade/modules/place/entity/PlaceEntity.java
@@ -16,10 +16,7 @@
*/
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;
@@ -44,6 +41,7 @@
@TableName("jczz_place")
@ApiModel(value = "Place对象", description = "场所表")
public class PlaceEntity implements Serializable {
+ private static final long serialVersionUID = 1L;
/**
* 主键
@@ -57,12 +55,35 @@
* 门牌地址编码
*/
@ApiModelProperty(value = "门牌地址编码")
- private String houseAddressCode;
+ private String houseCode;
+
/**
- * 场所负责人（关联用户表信息）
+ * 楼栋编码
*/
- @ApiModelProperty(value = "场所负责人（关联用户表信息）")
+ @ApiModelProperty(value = "楼栋编码")
+ private String buildingCode;
+
+ /**
+ * 场所负责人（关联用户表信息user_id）
+ */
+ @ApiModelProperty(value = "场所负责人（关联用户表信息user_id）")
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long principalUserId;
+
+ /**
+ * 场所负责人
+ */
+ @ApiModelProperty(value = "场所负责人")
+ @JsonSerialize(using = ToStringSerializer.class)
private String principal;
+
+ /**
+ * 场所负责人联系电话
+ */
+ @ApiModelProperty(value = "场所负责人联系电话")
+ @JsonSerialize(using = ToStringSerializer.class)
+ private String principalPhone;
+
/**
* 场所名称
*/
@@ -72,12 +93,12 @@
* 经度
*/
@ApiModelProperty(value = "经度")
- private BigDecimal lng;
+ private String lng;
/**
* 纬度
*/
@ApiModelProperty(value = "纬度")
- private BigDecimal lat;
+ private String lat;
/**
* 位置
*/
@@ -90,10 +111,23 @@
private String imageUrls;
/**
+ * 网格id
+ */
+ @ApiModelProperty(value = "网格id")
+ private Integer gridId;
+
+ /**
+ * 来源 1：地址总表 2：国控采集
+ */
+ @ApiModelProperty(value = "来源 1：地址总表 2：国控采集")
+ private Integer source;
+
+ /**
* 创建人
*/
@JsonSerialize(using = ToStringSerializer.class)
@ApiModelProperty("创建人")
+ @TableField(fill = FieldFill.INSERT)
private Long createUser;
/**
@@ -102,6 +136,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;
/**
@@ -109,6 +144,7 @@
*/
@JsonSerialize(using = ToStringSerializer.class)
@ApiModelProperty("更新人")
+ @TableField(fill = FieldFill.INSERT_UPDATE)
private Long updateUser;
/**
@@ -117,6 +153,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