From c8ebf3038d2a7f69d9eb40f5a276dc3fa826fa9b Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Tue, 10 Aug 2021 21:42:52 +0800
Subject: [PATCH] 报名接口修改,考试计算成绩接口修改，对比答案修改为对比所有题目
---
src/main/java/org/springblade/modules/system/entity/User.java | 54 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 54 insertions(+), 0 deletions(-)
diff --git a/src/main/java/org/springblade/modules/system/entity/User.java b/src/main/java/org/springblade/modules/system/entity/User.java
index 23c7f38..fc623f8 100644
--- a/src/main/java/org/springblade/modules/system/entity/User.java
+++ b/src/main/java/org/springblade/modules/system/entity/User.java
@@ -18,10 +18,12 @@
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.springblade.core.tenant.mp.TenantEntity;
+import org.springframework.format.annotation.DateTimeFormat;
import java.util.Date;
@@ -76,6 +78,8 @@
/**
* 生日
*/
+ @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
private Date birthday;
/**
* 性别
@@ -152,5 +156,55 @@
private String rtime;
+ private String hold;
+
+ /**
+ * 行政区域id
+ */
+ private String jurisdiction;
+ /**
+ * 保安员证编码
+ */
+ private String securitynumber;
+
+ /**
+ * 审查状态
+ */
+ @TableField("examination_type")
+ private String examinationType;
+
+
+ /**
+ * 审查明细
+ */
+ @TableField("examination_mx")
+ private String examinationMx;
+
+ /**
+ * 是否采集指纹
+ */
+ private String fingerprint;
+
+ /**
+ * 是否采集照片
+ */
+ private String photo;
+
+ /**
+ * 是否派遣
+ */
+ private String dispatch;
+
+ /**
+ * 个人照片，电子照，用于展示保安证，准考证用
+ */
+ @TableField("my_picture")
+ private String myPicture;
+
+ /**
+ * 是否报名考试 1：是 2：否
+ */
+ @TableField("is_apply")
+ private Integer isApply;
}
--
Gitblit v1.9.3