From d6746770d37e643663fcfe3b9524ed92fe9740c9 Mon Sep 17 00:00:00 2001
From: tangzy <tangzy123456>
Date: Wed, 07 Jul 2021 16:11:45 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.105:10010/r/zhba_management
---
src/main/java/org/springblade/modules/dispatcher/entity/Dispatcher.java | 22 +++++++++++++---------
1 files changed, 13 insertions(+), 9 deletions(-)
diff --git a/src/main/java/org/springblade/modules/dispatcher/entity/Dispatcher.java b/src/main/java/org/springblade/modules/dispatcher/entity/Dispatcher.java
index 2499d69..ed41dc8 100644
--- a/src/main/java/org/springblade/modules/dispatcher/entity/Dispatcher.java
+++ b/src/main/java/org/springblade/modules/dispatcher/entity/Dispatcher.java
@@ -16,16 +16,18 @@
*/
package org.springblade.modules.dispatcher.entity;
-import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import java.time.LocalDateTime;
import com.baomidou.mybatisplus.annotation.TableField;
-import java.io.Serializable;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.util.Date;
/**
* 实体类
@@ -62,7 +64,9 @@
*/
@ApiModelProperty(value = "派遣时间")
@TableField("dispatcherTime")
- private LocalDateTime dispatchertime;
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date dispatchertime;
/**
* 派遣地址
*/
@@ -73,8 +77,8 @@
* 派遣地址
*/
@ApiModelProperty(value = "派遣单位")
- @TableField("dispatcherCompany")
- private String dispatchercompany;
+ @TableField("dispatcher_unit_id")
+ private String dispatcherUnitId;
}
--
Gitblit v1.9.3