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/visit/VisitDto.java |   83 ++++++++++++++++++++++++++++++++++++++---
 1 files changed, 76 insertions(+), 7 deletions(-)

diff --git a/java110-bean/src/main/java/com/java110/dto/visit/VisitDto.java b/java110-bean/src/main/java/com/java110/dto/visit/VisitDto.java
index 375f871..21344de 100755
--- a/java110-bean/src/main/java/com/java110/dto/visit/VisitDto.java
+++ b/java110-bean/src/main/java/com/java110/dto/visit/VisitDto.java
@@ -14,20 +14,27 @@
  **/
 public class VisitDto extends PageDto implements Serializable {
 
-    //瀹℃牳鐘舵�� 0琛ㄧず鏈鏍革紱1琛ㄧず瀹℃牳閫氳繃锛�2琛ㄧず瀹℃牳鎷掔粷
+    //璁垮璁板綍瀹℃牳鐘舵�� 0琛ㄧず鏈鏍革紱1琛ㄧず瀹℃牳閫氳繃锛�2琛ㄧず瀹℃牳鎷掔粷
     public static final String STATE_W = "0"; //寰呭鏍�
     public static final String STATE_C = "1"; //琛ㄧず瀹℃牳閫氳繃
     public static final String STATE_F = "2"; //琛ㄧず瀹℃牳鎷掔粷
-
     public static final String STATE_D = "3"; // 瀹℃牳涓�
+
+    //杞﹁締瀹℃牳鐘舵�� 0琛ㄧず鏈鏍革紱1琛ㄧず瀹℃牳閫氳繃锛�2琛ㄧず瀹℃牳鎷掔粷
+    public static final String CAR_STATE_W = "0"; //寰呭鏍�
+    public static final String CAR_STATE_C = "1"; //琛ㄧず瀹℃牳閫氳繃
+    public static final String CAR_STATE_F = "2"; //琛ㄧず瀹℃牳鎷掔粷
+    public static final String CAR_STATE_D = "3"; // 瀹℃牳涓�
 
     private String departureTime;
     private String vName;
     private String visitGender;
     private String ownerId;
     private String ownerName;
-    private String userId;
+    private String createUserId;
     private String vId;
+    private String[] vIds;
+
     private String visitTime;
     private String phoneNumber;
     private String visitCase;
@@ -44,6 +51,9 @@
     private String state;
     private String stateName;
     private String stateRemark;
+    private String carState;
+    private String carStateRemark;
+    private String carStateName;
     private String createTime;
     private String sameDay;
     private String carNumNoEmpty;
@@ -51,11 +61,14 @@
     private String recordState;
     private String parkingAreaName;
     private String parkingSpaceNum;
+    private String parkAreaNum;
     private String flag;
+    private String sign;
     private String fileRelName;
     private String fileSaveName;
 
     private String flowId;
+    private String roomId;
 
     public String getvName() {
         return vName;
@@ -81,12 +94,12 @@
         this.ownerId = ownerId;
     }
 
-    public String getUserId() {
-        return userId;
+    public String getCreateUserId() {
+        return createUserId;
     }
 
-    public void setUserId(String userId) {
-        this.userId = userId;
+    public void setCreateUserId(String createUserId) {
+        this.createUserId = createUserId;
     }
 
     public String getvId() {
@@ -328,4 +341,60 @@
     public void setFlowId(String flowId) {
         this.flowId = flowId;
     }
+
+    public String[] getvIds() {
+        return vIds;
+    }
+
+    public void setvIds(String[] vIds) {
+        this.vIds = vIds;
+    }
+
+    public String getSign() {
+        return sign;
+    }
+
+    public void setSign(String sign) {
+        this.sign = sign;
+    }
+
+    public String getCarState() {
+        return carState;
+    }
+
+    public void setCarState(String carState) {
+        this.carState = carState;
+    }
+
+    public String getCarStateRemark() {
+        return carStateRemark;
+    }
+
+    public void setCarStateRemark(String carStateRemark) {
+        this.carStateRemark = carStateRemark;
+    }
+
+    public String getCarStateName() {
+        return carStateName;
+    }
+
+    public void setCarStateName(String carStateName) {
+        this.carStateName = carStateName;
+    }
+
+    public String getRoomId() {
+        return roomId;
+    }
+
+    public void setRoomId(String roomId) {
+        this.roomId = roomId;
+    }
+
+    public String getParkAreaNum() {
+        return parkAreaNum;
+    }
+
+    public void setParkAreaNum(String parkAreaNum) {
+        this.parkAreaNum = parkAreaNum;
+    }
 }

--
Gitblit v1.8.0