From 18d1f4bc4f4f77c8883702a00896dd99469db648 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期五, 25 八月 2023 16:06: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 | 12 ++++++++++--
1 files changed, 10 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 c4a7b9b..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;
@@ -42,6 +41,7 @@
private long min;
private String carType;
+ private String carTypeName;
private Date createTime;
@@ -234,4 +234,12 @@
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