From 4f9c122f237fbee16d5ef9c602b6db95d28ed7b0 Mon Sep 17 00:00:00 2001
From: mrzcc <121184950@qq.com>
Date: 星期一, 10 二月 2020 14:35:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 java110-bean/src/main/java/com/java110/vo/api/carInout/ApiCarInoutDataVo.java |   34 ++++++++++++++++++++++++++++++++++
 1 files changed, 34 insertions(+), 0 deletions(-)

diff --git a/java110-bean/src/main/java/com/java110/vo/api/carInout/ApiCarInoutDataVo.java b/java110-bean/src/main/java/com/java110/vo/api/carInout/ApiCarInoutDataVo.java
index 25fd8a6..b667492 100644
--- a/java110-bean/src/main/java/com/java110/vo/api/carInout/ApiCarInoutDataVo.java
+++ b/java110-bean/src/main/java/com/java110/vo/api/carInout/ApiCarInoutDataVo.java
@@ -7,9 +7,13 @@
 
     private String inoutId;
     private String state;
+    private String stateName;
     private String carNum;
     private String inTime;
     private String outTime;
+    private int inHours;
+    private int inMin;
+    private double money;
 
     public String getInoutId() {
         return inoutId;
@@ -51,5 +55,35 @@
         this.outTime = outTime;
     }
 
+    public int getInHours() {
+        return inHours;
+    }
 
+    public void setInHours(int inHours) {
+        this.inHours = inHours;
+    }
+
+    public double getMoney() {
+        return money;
+    }
+
+    public void setMoney(double money) {
+        this.money = money;
+    }
+
+    public int getInMin() {
+        return inMin;
+    }
+
+    public void setInMin(int inMin) {
+        this.inMin = inMin;
+    }
+
+    public String getStateName() {
+        return stateName;
+    }
+
+    public void setStateName(String stateName) {
+        this.stateName = stateName;
+    }
 }

--
Gitblit v1.8.0