From 212aa4ae1f54fe4d3e51b9695224f9f86cd1bd22 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期二, 11 七月 2023 10:58:48 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity
---
java110-bean/src/main/java/com/java110/dto/machine/CarInoutDto.java | 42 ++++++++++++++++++++++++++++++++++++++++--
1 files changed, 40 insertions(+), 2 deletions(-)
diff --git a/java110-bean/src/main/java/com/java110/dto/machine/CarInoutDto.java b/java110-bean/src/main/java/com/java110/dto/machine/CarInoutDto.java
index 97cf510..e7b70c3 100755
--- a/java110-bean/src/main/java/com/java110/dto/machine/CarInoutDto.java
+++ b/java110-bean/src/main/java/com/java110/dto/machine/CarInoutDto.java
@@ -1,7 +1,6 @@
package com.java110.dto.machine;
-import com.java110.dto.PageDto;
-import com.java110.dto.carInoutPayment.CarInoutPaymentDto;
+import com.java110.dto.payment.CarInoutPaymentDto;
import java.io.Serializable;
import java.util.Date;
@@ -23,11 +22,14 @@
public static final String STATE_REPAY = "100600";
public static final String STATE_IN_FAIL = "100301";
+ public static final String CAR_TYPE_MONTH = "1001";
+ public static final String CAR_TYPE_TEMP = "1003";
private String inTime;
private String inoutId;
private String carNum;
+ private String oldCarNum;
private String state;
private String stateName;
private String[] states;
@@ -39,6 +41,7 @@
private long min;
private String carType;
+ private String carTypeName;
private Date createTime;
@@ -49,6 +52,9 @@
private String feeName;
private String feeConfigId;
private String configId;
+
+ private String startTime;
+ private String endTime;
public String getInoutId() {
@@ -204,4 +210,36 @@
public void setConfigId(String configId) {
this.configId = configId;
}
+
+ public String getStartTime() {
+ return startTime;
+ }
+
+ public void setStartTime(String startTime) {
+ this.startTime = startTime;
+ }
+
+ public String getEndTime() {
+ return endTime;
+ }
+
+ public void setEndTime(String endTime) {
+ this.endTime = endTime;
+ }
+
+ public String getOldCarNum() {
+ return oldCarNum;
+ }
+
+ public void setOldCarNum(String oldCarNum) {
+ this.oldCarNum = oldCarNum;
+ }
+
+ public String getCarTypeName() {
+ return carTypeName;
+ }
+
+ public void setCarTypeName(String carTypeName) {
+ this.carTypeName = carTypeName;
+ }
}
--
Gitblit v1.8.0