From 3b1e22dc8460daafc2ecbae478ddcbe5ea21b944 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Sat, 18 Sep 2021 17:27:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/springblade/modules/dispatcher/entity/DispatcherUnit.java | 35 +++++++++++++++++++++++++++++++----
1 files changed, 31 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 4abc8e6..f930a72 100644
--- a/src/main/java/org/springblade/modules/dispatcher/entity/DispatcherUnit.java
+++ b/src/main/java/org/springblade/modules/dispatcher/entity/DispatcherUnit.java
@@ -7,6 +7,7 @@
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;
+
import java.io.Serializable;
import java.util.Date;
@@ -29,13 +30,13 @@
private Long id;
/**
- * 派遣单位名称
- */
+ * 派遣单位名称
+ */
private String name;
/**
- * 部门id
- */
+ * 部门id
+ */
@TableField("dept_id")
private Long deptId;
@@ -83,4 +84,30 @@
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