From cddd83f139af1786517759277ced8479cbe80d3b Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期三, 19 二月 2020 12:57:09 +0800
Subject: [PATCH] Merge branch 'master' of https://github.com/java110/MicroCommunity
---
java110-bean/src/main/java/com/java110/dto/hardwareAdapation/CarInoutDto.java | 26 ++++++++++++++++----------
1 files changed, 16 insertions(+), 10 deletions(-)
diff --git a/java110-bean/src/main/java/com/java110/dto/hardwareAdapation/CarInoutDto.java b/java110-bean/src/main/java/com/java110/dto/hardwareAdapation/CarInoutDto.java
index f2f7450..5cab8b4 100644
--- a/java110-bean/src/main/java/com/java110/dto/hardwareAdapation/CarInoutDto.java
+++ b/java110-bean/src/main/java/com/java110/dto/hardwareAdapation/CarInoutDto.java
@@ -17,17 +17,15 @@
**/
public class CarInoutDto extends PageDto implements Serializable {
- @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- private Date inTime;
+
+ private String inTime;
private String inoutId;
private String carNum;
private String state;
+ private String stateName;
private String[] states;
private String communityId;
- @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- private Date outTime;
+ private String outTime;
private Date createTime;
@@ -93,19 +91,27 @@
this.states = states;
}
- public Date getInTime() {
+ public String getInTime() {
return inTime;
}
- public void setInTime(Date inTime) {
+ public void setInTime(String inTime) {
this.inTime = inTime;
}
- public Date getOutTime() {
+ public String getOutTime() {
return outTime;
}
- public void setOutTime(Date outTime) {
+ public void setOutTime(String outTime) {
this.outTime = outTime;
}
+
+ public String getStateName() {
+ return stateName;
+ }
+
+ public void setStateName(String stateName) {
+ this.stateName = stateName;
+ }
}
--
Gitblit v1.8.0