From 62eb499b0c969f246d3245d1429a97da4de1ce28 Mon Sep 17 00:00:00 2001
From: 钟日健 <arsn163@163.com>
Date: Mon, 01 Jun 2026 20:46:13 +0800
Subject: [PATCH] feat: 成绩查询增加年龄查询返回

---
 src/main/java/org/springblade/modules/system/entity/User.java |   48 +++++++++++++++++++++++++++++-------------------
 1 files changed, 29 insertions(+), 19 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 1e2f0dc..7bc042b 100644
--- a/src/main/java/org/springblade/modules/system/entity/User.java
+++ b/src/main/java/org/springblade/modules/system/entity/User.java
@@ -139,23 +139,6 @@
 	 */
 	@ApiModelProperty(value = "邮箱")
 	private String emails;
-	/**
-	 * 联系地址
-	 */
-	@ApiModelProperty(value = "联系地址")
-	private String address;
-	/**
-	 * 户口所在地
-	 */
-	@ApiModelProperty(value = "户口所在地")
-	private String registered ;
-	/**
-	 * 入职时间
-	 */
-	@ApiModelProperty(value = "入职时间")
-	@JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
-	@DateTimeFormat(pattern = "yyyy-MM-dd")
-	private Date rtime;
 
 
 	private String hold;
@@ -183,7 +166,7 @@
 	private String examinationMx;
 
 	/**
-	 * 是否采集指纹
+	 * 指纹url
 	 */
 	private String fingerprint;
 
@@ -198,7 +181,7 @@
 	private String dispatch;
 
 	/**
-	 * 个人照片,电子照,用于展示保安证,准考证用
+	 * 指纹特征
 	 */
 	@TableField("my_picture")
 	private String myPicture;
@@ -237,6 +220,12 @@
 	@TableField("reason_for_leav")
 	private String reasonForLeav;
 
+	/**
+	 * 离职图片
+	 */
+	@TableField("img_for_leav")
+	private String imgForLeav;
+
 	private String holdv;
 
 	@JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
@@ -255,4 +244,25 @@
 	@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
 	@TableField("audit_time")
 	private Date auditTime;
+
+	/**
+	 * 持枪编码
+	 */
+	private String guncode;
+
+	/**
+	 * 押运人员设备编号
+	 */
+	@TableField("equipment_code")
+	private String equipmentCode;
+
+	/**
+	 * 是否冻结 0:否  1:是
+	 */
+	private Integer isFreeze;
+
+	/**
+	 * 审核状态:1、审核通过;2、审核不通过 10、待审核
+	 */
+	private Integer auditStatus;
 }

--
Gitblit v1.9.3