From 0b04f664887c73e90bf684a4e69c0fdbfe26349d Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期三, 29 三月 2023 13:35:20 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity
---
java110-bean/src/main/java/com/java110/dto/machine/CarInoutDetailDto.java | 67 +++++++++++++++++++++++++++++++--
1 files changed, 63 insertions(+), 4 deletions(-)
diff --git a/java110-bean/src/main/java/com/java110/dto/machine/CarInoutDetailDto.java b/java110-bean/src/main/java/com/java110/dto/machine/CarInoutDetailDto.java
index 0938be4..ee05865 100755
--- a/java110-bean/src/main/java/com/java110/dto/machine/CarInoutDetailDto.java
+++ b/java110-bean/src/main/java/com/java110/dto/machine/CarInoutDetailDto.java
@@ -1,7 +1,5 @@
package com.java110.dto.machine;
-import com.java110.dto.PageDto;
-
import java.io.Serializable;
import java.util.Date;
@@ -17,7 +15,8 @@
public static final String CAR_INOUT_IN = "3306";
public static final String CAR_INOUT_OUT = "3307";
-
+ public static final String CAR_TYPE_TEMP = "1003";
+ public static final String CAR_TYPE_MONTH = "1001";
private String inoutId;
private String machineId;
private String machineCode;
@@ -27,13 +26,20 @@
private String communityId;
-
private Date createTime;
private String statusCd = "0";
private String remark;
+ private String state;
+ private String inState;
+ private String carType;
+ private String carTypeName;
+
+ private String configId;
+
+ private String photoJpg;
public String getInoutId() {
return inoutId;
@@ -115,4 +121,57 @@
public void setRemark(String remark) {
this.remark = remark;
}
+
+ @Override
+ public String getState() {
+ return state;
+ }
+
+ @Override
+ public void setState(String state) {
+ this.state = state;
+ }
+
+
+ public String getCarType() {
+ return carType;
+ }
+
+ public void setCarType(String carType) {
+ this.carType = carType;
+ }
+
+ public String getConfigId() {
+ return configId;
+ }
+
+ public void setConfigId(String configId) {
+ this.configId = configId;
+ }
+
+ @Override
+ public String getCarTypeName() {
+ return carTypeName;
+ }
+
+ @Override
+ public void setCarTypeName(String carTypeName) {
+ this.carTypeName = carTypeName;
+ }
+
+ public String getInState() {
+ return inState;
+ }
+
+ public void setInState(String inState) {
+ this.inState = inState;
+ }
+
+ public String getPhotoJpg() {
+ return photoJpg;
+ }
+
+ public void setPhotoJpg(String photoJpg) {
+ this.photoJpg = photoJpg;
+ }
}
--
Gitblit v1.8.0