From c4e2c196aad8af656d94bc47e9f1a80bc504b5d7 Mon Sep 17 00:00:00 2001
From: lin <sbla5888@163.com>
Date: Thu, 14 Mar 2024 18:15:29 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/springblade/modules/place/entity/PlacePractitionerEntity.java | 116 ++++++++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 97 insertions(+), 19 deletions(-)
diff --git a/src/main/java/org/springblade/modules/place/entity/PlacePractitionerEntity.java b/src/main/java/org/springblade/modules/place/entity/PlacePractitionerEntity.java
index eb7eeba..65a10b7 100644
--- a/src/main/java/org/springblade/modules/place/entity/PlacePractitionerEntity.java
+++ b/src/main/java/org/springblade/modules/place/entity/PlacePractitionerEntity.java
@@ -16,9 +16,8 @@
*/
package org.springblade.modules.place.entity;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-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;
@@ -28,6 +27,7 @@
import org.springblade.core.tenant.mp.TenantEntity;
import java.io.Serializable;
+import java.util.Date;
/**
* 场所从业人员 实体类
@@ -39,6 +39,7 @@
@TableName("jczz_place_practitioner")
@ApiModel(value = "PlacePractitioner对象", description = "场所从业人员")
public class PlacePractitionerEntity implements Serializable {
+ private static final long serialVersionUID = 1L;
/**
* 主键
*/
@@ -47,25 +48,102 @@
@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;
- /**
- * 姓名
- */
- @ApiModelProperty(value = "姓名")
+
+ /** 姓名 */
+ @ApiModelProperty(value = "姓名", example = "")
+ @TableField("name")
private String name;
- /**
- * 电话
- */
- @ApiModelProperty(value = "电话")
+
+ /** 电话 */
+ @ApiModelProperty(value = "电话", example = "")
+ @TableField("telephone")
private String telephone;
- /**
- * 暂住地
- */
- @ApiModelProperty(value = "暂住地")
+
+ /** 现住地址 */
+ @ApiModelProperty(value = "现住地址", example = "")
+ @TableField("temp_address")
private String tempAddress;
+ /** 年龄 */
+ @ApiModelProperty(value = "年龄", example = "")
+ @TableField("age")
+ private Integer age;
+
+ /** 性别 */
+ @ApiModelProperty(value = "性别", example = "")
+ @TableField("gender")
+ private Integer gender;
+
+ /** 身份证 */
+ @ApiModelProperty(value = "身份证", example = "")
+ @TableField("id_card")
+ private String idCard;
+
+ /** 证件类型，业务字典 cardType */
+ @ApiModelProperty(value = "证件类型，业务字典 cardType", example = "")
+ @TableField("card_type")
+ private String cardType;
+
+ /** 工作单位(就职单位) */
+ @ApiModelProperty(value = "工作单位(就职单位)", example = "")
+ @TableField("employer")
+ private String employer;
+
+ /** 户籍地址 */
+ @ApiModelProperty(value = "户籍地址", example = "")
+ @TableField("registered_address")
+ private String registeredAddress;
+
+ /** 岗位性质 */
+ @ApiModelProperty(value = "岗位性质", example = "")
+ @TableField("job_nature")
+ private String jobNature;
+
+ /** 从业人员的照片 */
+ @ApiModelProperty(value = "从业人员的照片", example = "")
+ @TableField("employer_img")
+ private String employerImg;
+
+ /** 微信号 */
+ @ApiModelProperty(value = "微信号", example = "")
+ @TableField("wx_account")
+ private String wxAccount;
+
+ /** 创建时间 */
+ @ApiModelProperty(value = "创建时间", example = "")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @TableField(value = "create_time",fill = FieldFill.INSERT)
+ private Date createTime;
+ /** 生日 */
+ @ApiModelProperty(value = "生日", example = "")
+ @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+ @TableField("birthday")
+ private Date birthday;
+
+ /** 民族 */
+ @ApiModelProperty(value = "民族", example = "")
+ @TableField("ethnicity")
+ private Integer ethnicity;
+
+ /** 民族 */
+ @ApiModelProperty(value = "0：否1：是", example = "")
+ @TableField("is_deleted")
+ private Integer isDeleted;
+
+
+ /** 0:否 1：是 前科 */
+ @ApiModelProperty(value = "0:否 1：是 前科", example = "")
+ @TableField("criminal_record_flag")
+ private Integer criminalRecordFlag;
+
+ /** 0:否 1：是 假身份证 */
+ @ApiModelProperty(value = "0:否 1：是 假身份证", example = "")
+ @TableField("fake_id_card")
+ private Integer fakeIdCard;
+
+
}
--
Gitblit v1.9.3