From b39cc2beacc1ec2e37cff349cae42e420105c8a6 Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Fri, 05 Nov 2021 14:29:47 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/springblade/modules/zc/entity/Zc.java | 19 +++++++++++++++++++
1 files changed, 19 insertions(+), 0 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..699e106 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;
/**
* 实体类
@@ -93,6 +97,21 @@
@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;
}
--
Gitblit v1.9.3