From 9f8f9d13c42ca8cdccbf351069082a5fdccef2e4 Mon Sep 17 00:00:00 2001
From: lin <sbla5888@163.com>
Date: Mon, 25 Mar 2024 17:30:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/springblade/modules/place/entity/PlaceExtEntity.java | 193 ++++++++++++++++++++++++++++++++++--------------
1 files changed, 137 insertions(+), 56 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..8b35b59 100644
--- a/src/main/java/org/springblade/modules/place/entity/PlaceExtEntity.java
+++ b/src/main/java/org/springblade/modules/place/entity/PlaceExtEntity.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;
@@ -43,6 +40,7 @@
@TableName("jczz_place_ext")
@ApiModel(value = "PlaceExt对象", description = "场所详情表")
public class PlaceExtEntity implements Serializable {
+ private static final long serialVersionUID = 1L;
/**
* 主键
@@ -52,72 +50,155 @@
@TableId(value = "id", type = IdType.ASSIGN_ID)
private Long id;
- /**
- * 场所ID
- */
- @ApiModelProperty(value = "场所ID")
+ /** 场所ID */
+ @ApiModelProperty(value = "场所ID", example = "")
+ @TableField("place_id")
private Long placeId;
- /**
- * 营业执照图片URLS
- */
- @ApiModelProperty(value = "营业执照图片URLS")
+
+ /** 营业执照图片URLS */
+ @ApiModelProperty(value = "营业执照图片URLS", example = "")
+ @TableField("image_urls")
private String imageUrls;
- /**
- * 场所位置
- */
- @ApiModelProperty(value = "场所位置")
- private String localtion;
- /**
- * 法人信息
- */
- @ApiModelProperty(value = "法人信息")
+
+ /** 法人信息 */
+ @ApiModelProperty(value = "法人信息", example = "")
+ @TableField("legal_person")
private String legalPerson;
- /**
- * 法人电话
- */
- @ApiModelProperty(value = "法人电话")
+
+ /** 法人电话 */
+ @ApiModelProperty(value = "法人电话", example = "")
+ @TableField("legal_tel")
private String legalTel;
- /**
- * 场所平面图URLS
- */
- @ApiModelProperty(value = "场所平面图URLS")
+
+ /** 场所平面图URLS */
+ @ApiModelProperty(value = "场所平面图URLS", example = "")
+ @TableField("plan_image_urls")
private String planImageUrls;
- /**
- * 创建人
- */
- @JsonSerialize(using = ToStringSerializer.class)
- @ApiModelProperty("创建人")
+ /** 审核确认人用户id */
+ @ApiModelProperty(value = "审核确认人用户id", example = "")
+ @TableField("confirm_user_id")
+ private Long confirmUserId;
+
+ /** 确认标记 1：待审核 2：审核通过 3：审核不通过 4:待完善 */
+ @ApiModelProperty(value = "确认标记 1：待审核 2：审核通过 3：审核不通过 4:待完善", example = "")
+ @TableField("confirm_flag")
+ private Integer confirmFlag;
+
+ /** 审核确认时间 */
+ @ApiModelProperty(value = "审核确认时间", example = "")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @TableField("confirm_time")
+ private Date confirmTime;
+
+ /** 审核意见 */
+ @ApiModelProperty(value = "审核意见", example = "")
+ @TableField("confirm_notion")
+ private String confirmNotion;
+
+ /** 创建人 */
+ @ApiModelProperty(value = "创建人", example = "")
+ @TableField("create_user")
private Long createUser;
- /**
- * 创建时间
- */
- @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- @ApiModelProperty("创建时间")
+ /** 创建时间 */
+ @ApiModelProperty(value = "创建时间", example = "")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @TableField("create_time")
private Date createTime;
- /**
- * 更新人
- */
- @JsonSerialize(using = ToStringSerializer.class)
- @ApiModelProperty("更新人")
+ /** 更新人 */
+ @ApiModelProperty(value = "更新人", example = "")
+ @TableField("update_user")
private Long updateUser;
- /**
- * 更新时间
- */
- @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- @ApiModelProperty("更新时间")
+ /** 更新时间 */
+ @ApiModelProperty(value = "更新时间", example = "")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @TableField("update_time")
private Date updateTime;
- /**
- * 是否删除
- */
- @TableLogic
- @ApiModelProperty("是否已删除 0:否 1:是")
+ /** 是否删除 0:否 1:是 */
+ @ApiModelProperty(value = "是否删除 0:否 1:是", example = "")
+ @TableField("is_deleted")
private Integer isDeleted;
+// /** 法人现住地址 */
+// @ApiModelProperty(value = "法人现住地址", example = "")
+// @TableField("legal_temp_address")
+// private String legalTempAddress;
+//
+// /** 法人年龄 */
+// @ApiModelProperty(value = "法人年龄", example = "")
+// @TableField("legal_age")
+// private Integer legalAge;
+//
+// /** 法人性别 */
+// @ApiModelProperty(value = "法人性别", example = "")
+// @TableField("legal_gender")
+// private Integer legalGender;
+//
+// /** 法人身份证 */
+ @ApiModelProperty(value = "法人身份证", example = "")
+ @TableField("legal_id_card")
+ private String legalIdCard;
+//
+// /** 法人证件类型，业务字典 cardType */
+// @ApiModelProperty(value = "法人证件类型，业务字典 cardType", example = "")
+// @TableField("legal_card_type")
+// private String legalCardType;
+//
+// /** 法人户籍地址 */
+// @ApiModelProperty(value = "法人户籍地址", example = "")
+// @TableField("legal_registered_address")
+// private String legalRegisteredAddress;
+//
+// /** 法人岗位性质 */
+// @ApiModelProperty(value = "法人岗位性质", example = "")
+// @TableField("legal_job_nature")
+// private String legalJobNature;
+//
+// /** 法人微信号 */
+// @ApiModelProperty(value = "法人微信号", example = "")
+// @TableField("legal_wx_account")
+// private String legalWxAccount;
+
+
+// /** 生日 */
+// @ApiModelProperty(value = "生日", example = "")
+// @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+// @TableField("birthday")
+// private Date birthday;
+//
+// /** 民族 */
+// @ApiModelProperty(value = "民族", example = "")
+// @TableField("ethnicity")
+// private Integer ethnicity;
+//
+// /** 工作单位(就职单位) */
+// @ApiModelProperty(value = "工作单位(就职单位)", example = "")
+// @TableField("employer")
+// private String employer;
+
+ /** 房东名字 */
+ @ApiModelProperty(value = "房东名字", example = "")
+ @TableField("landlord_name")
+ private String landlordName;
+
+ /** 房东手机号 */
+ @ApiModelProperty(value = "房东手机号", example = "")
+ @TableField("landlord_phone")
+ private String landlordPhone;
+
+ /** 房东微信号 */
+ @ApiModelProperty(value = "房东微信号", example = "")
+ @TableField("landlord_wx_account")
+ private String landlordWxAccount;
+
+ /** 房东身份证号 */
+ @ApiModelProperty(value = "房东身份证号", example = "")
+ @TableField("landlord_id_card")
+ private String landlordIdCard;
+
+
}
--
Gitblit v1.9.3