From 19f40c8e0649ae81b3f0183a6f4c8aa6c3db39bc Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Thu, 18 Nov 2021 17:54:37 +0800
Subject: [PATCH] 证书打印信息导出修改,已过考试的,系统每天凌晨1点定时清理,标记为缺考,并生成缺考记录,保安员导入新增年龄判断,超过60岁的不能导入

---
 src/main/java/org/springblade/modules/dispatcher/entity/DispatcherUnit.java |   35 ++++++++++++++++++++++++++++++++---
 1 files changed, 32 insertions(+), 3 deletions(-)

diff --git a/src/main/java/org/springblade/modules/dispatcher/entity/DispatcherUnit.java b/src/main/java/org/springblade/modules/dispatcher/entity/DispatcherUnit.java
index 780686d..a6156a6 100644
--- a/src/main/java/org/springblade/modules/dispatcher/entity/DispatcherUnit.java
+++ b/src/main/java/org/springblade/modules/dispatcher/entity/DispatcherUnit.java
@@ -34,10 +34,10 @@
 	private String name;
 
 	/**
-	* 保安公司 tenant_id
+	* 部门id
 	*/
-	@TableField("tenant_id")
-	private String tenantId;
+	@TableField("dept_id")
+	private Long deptId;
 
 	/**
 	 * 联系人
@@ -77,5 +77,34 @@
 	@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
 	private Date createTime;
 
+	/**
+	 * 行政区id
+	 */
+	private Long jurisdiction;
+
+	/**
+	 * 合同生效时间
+	 */
+	@TableField("start_time")
+	@JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
+	@DateTimeFormat(pattern = "yyyy-MM-dd")
+	private Date startTime;
+
+
+
+	/**
+	 * 合同到期时间
+	 */
+	@TableField("end_time")
+	@JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
+	@DateTimeFormat(pattern = "yyyy-MM-dd")
+	private Date endTime;
+
+	/**
+	 * 保安服务类型
+	 */
+	@TableField("serve_type")
+	private String serveType;
+
 
 }

--
Gitblit v1.9.3