From afc2b4d2800d91c793523d14fbe2d6fbbd319fc0 Mon Sep 17 00:00:00 2001
From: 钟日健 <5689795+arsn@user.noreply.gitee.com>
Date: Fri, 25 Feb 2022 09:02:41 +0800
Subject: [PATCH] 模拟考试开始修改,返回所有题目的所有答题信息

---
 src/main/java/org/springblade/modules/dispatcher/entity/DispatcherUnit.java |   53 +++++++++++++++++++++++++++++++++++++++++++++++++----
 1 files changed, 49 insertions(+), 4 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..034d836 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;
 
 	/**
 	 * 联系人
@@ -60,7 +60,7 @@
 	private Integer city;
 
 	/**
-	 * 区
+	 * 区 (暂时用作派遣单位类型使用,学校,医院等)
 	 */
 	private Integer district;
 
@@ -77,5 +77,50 @@
 	@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;
+
+	/**
+	 * 负责人(保安公司人员)
+	 */
+	@TableField("security_linkman")
+	private String securityLinkman;
+
+	/**
+	 * 负责人电话
+	 */
+	private String cell;
+
+	/**
+	 * 派遣人数
+	 */
+	private Integer num;
+
 
 }

--
Gitblit v1.9.3