From 4c19ddd36bdfb43b5ef4e8df3c9a98cd4d356d6c Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Thu, 26 May 2022 10:55:04 +0800
Subject: [PATCH] 1、资讯模糊匹配修改

---
 src/main/java/org/springblade/modules/zc/entity/Zc.java |   78 ++++++++++++++++++++++++++++-----------
 1 files changed, 56 insertions(+), 22 deletions(-)

diff --git a/src/main/java/org/springblade/modules/zc/entity/Zc.java b/src/main/java/org/springblade/modules/zc/entity/Zc.java
index a1ae460..80578cb 100644
--- a/src/main/java/org/springblade/modules/zc/entity/Zc.java
+++ b/src/main/java/org/springblade/modules/zc/entity/Zc.java
@@ -17,13 +17,17 @@
 package org.springblade.modules.zc.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
 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;
 
 /**
  * 实体类
@@ -39,32 +43,32 @@
 	private static final long serialVersionUID = 1L;
 
 	@TableId(value = "id", type = IdType.AUTO)
-	private Integer id;
+	private Long id;
 	/**
-	* 账号
-	*/
-		@ApiModelProperty(value = "账号")
-		private String username;
+	 * 账号
+	 */
+	@ApiModelProperty(value = "账号")
+	private String username;
 	/**
-	* 密码
-	*/
-		@ApiModelProperty(value = "密码")
-		private String password;
+	 * 密码
+	 */
+	@ApiModelProperty(value = "密码")
+	private String password;
 	/**
-	* 姓名
-	*/
-		@ApiModelProperty(value = "姓名")
-		private String sname;
+	 * 姓名
+	 */
+	@ApiModelProperty(value = "姓名")
+	private String sname;
 	/**
-	* 性别
-	*/
-		@ApiModelProperty(value = "性别")
-		private String sex;
+	 * 性别
+	 */
+	@ApiModelProperty(value = "性别")
+	private String sex;
 	/**
-	* 手机号码
-	*/
-		@ApiModelProperty(value = "手机号码")
-		private String phone;
+	 * 手机号码
+	 */
+	@ApiModelProperty(value = "手机号码")
+	private String phone;
 
 	/**
 	 * 注册时间
@@ -88,11 +92,41 @@
 	@ApiModelProperty(value = "角色id")
 	private String parentId;
 	/**
-	 * 辖区id
+	 * 居住地辖区id
 	 */
 	@ApiModelProperty(value = "辖区id")
 	private String jurisdiction;
 
+	/**
+	 * 身份证号
+	 */
+	private String cardid;
 
+	private String examination_type;
+
+	private String examination_mx;
+
+	/**
+	 * 审查时间
+	 */
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+	@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+	@TableField("audit_time")
+	private Date auditTime;
+	/**
+	 * 居住地地址
+	 */
+	private String address;
+	/**
+	 * 工作地点
+	 */
+	private String workaddress;
+	/**
+	 * 工作辖区
+	 */
+	private String workjurisdiction;
+	private String signals;
+	@TableField("job_unit")
+	private String jobUnit;
 
 }

--
Gitblit v1.9.3