From d7d9b601b2e4fdb663375993e2cfbdbd363df421 Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: 星期二, 11 七月 2023 22:17:37 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity
---
java110-bean/src/main/java/com/java110/dto/machine/CarInoutDto.java | 21 +++++++++++++++++++--
1 files changed, 19 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 6cf9b94..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;
@@ -30,6 +29,7 @@
private String inTime;
private String inoutId;
private String carNum;
+ private String oldCarNum;
private String state;
private String stateName;
private String[] states;
@@ -41,6 +41,7 @@
private long min;
private String carType;
+ private String carTypeName;
private Date createTime;
@@ -225,4 +226,20 @@
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