From b6184e2ddf3db37a94f7efb3b619bbc64642a292 Mon Sep 17 00:00:00 2001
From: chengf <cgf12138@163.com>
Date: 星期二, 27 一月 2026 18:12:48 +0800
Subject: [PATCH] Z四

---
 java110-bean/src/main/java/com/java110/dto/owner/OwnerCarDto.java |  151 ++++++++++++++++++++++++++++++++++++++++++++++++--
 1 files changed, 145 insertions(+), 6 deletions(-)

diff --git a/java110-bean/src/main/java/com/java110/dto/owner/OwnerCarDto.java b/java110-bean/src/main/java/com/java110/dto/owner/OwnerCarDto.java
index 1037532..61f2568 100755
--- a/java110-bean/src/main/java/com/java110/dto/owner/OwnerCarDto.java
+++ b/java110-bean/src/main/java/com/java110/dto/owner/OwnerCarDto.java
@@ -1,7 +1,7 @@
 package com.java110.dto.owner;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.java110.dto.PageDto;
-import com.java110.dto.ownerCarAttr.OwnerCarAttrDto;
 
 import java.io.Serializable;
 import java.util.Date;
@@ -28,12 +28,17 @@
     public static final String CAR_TYPE_CD_TEMP = "1003";
 
     public static final String LEASE_TYPE_MONTH = "H"; // 鏈堢杞�
-    public static final String LEASE_TYPE_SALE = "S"; // 鍑哄敭杞�
-    public static final String LEASE_TYPE_INNER = "I"; //鍐呴儴杞�
-    public static final String LEASE_TYPE_NO_MONEY = "NM"; //鍏嶈垂杞�
-    public static final String LEASE_TYPE_RESERVE = "R"; //棰勭害杞�
+    // public static final String LEASE_TYPE_SALE = "S"; // 鍑哄敭杞�
+    // public static final String LEASE_TYPE_INNER = "I"; //鍐呴儴杞�
+    // public static final String LEASE_TYPE_NO_MONEY = "NM"; //鍏嶈垂杞�
+    // public static final String LEASE_TYPE_RESERVE = "R"; //棰勭害杞�
 
     public static final String LEASE_TYPE_TEMP = "T";//涓存椂杞�
+
+    public static final String LEASE_TYPE_STORE = "SP"; // 鍟嗛摵杞�
+    public static final String LEASE_TYPE_INNER = "I"; //涓氬浼氱収椤捐溅
+    public static final String LEASE_TYPE_NO_MONEY = "NM"; //灏忎笟涓讳骇鏉冭溅
+    public static final String LEASE_TYPE_RESERVE = "R"; //绉熷杞�
 
     public static final String CAR_TYPE_CREDIT = "9906"; //淇＄敤鏈熻溅鐗�
 
@@ -43,8 +48,11 @@
     private String carTypeName;
     private String carNum;
     private String carNumLike;
+    private String memberCarNum;
+    private String memberCarNumLike;
     private String[] carNums;
     private String communityId;
+    private String[] communityIds;
     private String psId;
     private String[] psIds;
     private String[] paIds;
@@ -63,11 +71,14 @@
     private String spaceSate;
 
     private String roomName;
-
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     private Date startTime;
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     private Date endTime;
     private String state;
     private String stateName;
+    private String iotStateName;
+    private String iotRemark;
 
     private String areaNum;
 
@@ -84,6 +95,7 @@
     private String carTypeCdName;
     private String[] carTypeCds;
     private String memberId;
+    private String[] memberIds;
     private String unitId;
     private String floorNum;
     private String unitNum;
@@ -97,7 +109,22 @@
 
     private String memberCarCount;
 
+    private String userName;
+
+    private String operate;
+
+    private String staffNameLike;
+
+    private String logStartTime;
+    private String logEndTime;
+
+    private String paId;
+
+    private Object[] otherItem;
+
     private List<OwnerCarAttrDto> ownerCarAttrDto;
+
+    private String roadName;
 
     public String getCarColor() {
         return carColor;
@@ -482,4 +509,116 @@
     public void setMemberCarCount(String memberCarCount) {
         this.memberCarCount = memberCarCount;
     }
+
+    public String getMemberCarNum() {
+        return memberCarNum;
+    }
+
+    public void setMemberCarNum(String memberCarNum) {
+        this.memberCarNum = memberCarNum;
+    }
+
+    public String getMemberCarNumLike() {
+        return memberCarNumLike;
+    }
+
+    public void setMemberCarNumLike(String memberCarNumLike) {
+        this.memberCarNumLike = memberCarNumLike;
+    }
+
+    public String getIotStateName() {
+        return iotStateName;
+    }
+
+    public void setIotStateName(String iotStateName) {
+        this.iotStateName = iotStateName;
+    }
+
+    public String getIotRemark() {
+        return iotRemark;
+    }
+
+    public void setIotRemark(String iotRemark) {
+        this.iotRemark = iotRemark;
+    }
+
+    public String getUserName() {
+        return userName;
+    }
+
+    public void setUserName(String userName) {
+        this.userName = userName;
+    }
+
+    public String getOperate() {
+        return operate;
+    }
+
+    public void setOperate(String operate) {
+        this.operate = operate;
+    }
+
+    public String getStaffNameLike() {
+        return staffNameLike;
+    }
+
+    public void setStaffNameLike(String staffNameLike) {
+        this.staffNameLike = staffNameLike;
+    }
+
+    public String getLogStartTime() {
+        return logStartTime;
+    }
+
+    public void setLogStartTime(String logStartTime) {
+        this.logStartTime = logStartTime;
+    }
+
+    public String getLogEndTime() {
+        return logEndTime;
+    }
+
+    public void setLogEndTime(String logEndTime) {
+        this.logEndTime = logEndTime;
+    }
+
+    public String getPaId() {
+        return paId;
+    }
+
+    public void setPaId(String paId) {
+        this.paId = paId;
+    }
+
+    public String[] getMemberIds() {
+        return memberIds;
+    }
+
+    public void setMemberIds(String[] memberIds) {
+        this.memberIds = memberIds;
+    }
+
+    public String[] getCommunityIds() {
+        return communityIds;
+    }
+
+    public void setCommunityIds(String[] communityIds) {
+        this.communityIds = communityIds;
+    }
+
+    public Object[] getOtherItem() {
+        return otherItem;
+    }
+
+    public void setOtherItem(Object[] otherItem) {
+        this.otherItem = otherItem;
+    }
+
+    public String getRoadName() {
+        return roadName;
+    }
+
+    public void setRoadName(String roadName) {
+        this.roadName = roadName;
+    }
 }

--
Gitblit v1.8.0