From 212aa4ae1f54fe4d3e51b9695224f9f86cd1bd22 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期二, 11 七月 2023 10:58:48 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity

---
 java110-bean/src/main/java/com/java110/dto/owner/OwnerCarDto.java |   80 ++++++++++++++++++++++++++++++++++++++-
 1 files changed, 77 insertions(+), 3 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 6b84092..a60cfa8 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,6 @@
 package com.java110.dto.owner;
 
 import com.java110.dto.PageDto;
-import com.java110.dto.ownerCarAttr.OwnerCarAttrDto;
 
 import java.io.Serializable;
 import java.util.Date;
@@ -21,7 +20,6 @@
     public static final String STATE_OWE = "2002";
     public static final String STATE_FINISH = "3003";
 
-
     public static final String CAR_TYPE_PRIMARY = "1001"; //涓昏溅杈�
     public static final String CAR_TYPE_MEMBER = "1002"; //杞﹁締鎴愬憳
     public static final String CAR_TYPE_TEMP = "1003"; //涓存椂杞�
@@ -36,12 +34,16 @@
 
     public static final String LEASE_TYPE_TEMP = "T";//涓存椂杞�
 
+    public static final String CAR_TYPE_CREDIT = "9906"; //淇＄敤鏈熻溅鐗�
+
     private String carColor;
     private String carBrand;
     private String carType;
     private String carTypeName;
     private String carNum;
     private String carNumLike;
+    private String memberCarNum;
+    private String memberCarNumLike;
     private String[] carNums;
     private String communityId;
     private String psId;
@@ -67,6 +69,8 @@
     private Date endTime;
     private String state;
     private String stateName;
+    private String iotStateName;
+    private String iotRemark;
 
     private String areaNum;
 
@@ -90,11 +94,16 @@
     private String oweAmount;
 
     private String leaseType;
+    private String[] leaseTypes;
 
     private String leaseTypeName;
 
-    private List<OwnerCarAttrDto> ownerCarAttrDto;
+    private String memberCarCount;
 
+    private String userName;
+
+    private String operate;
+    private List<OwnerCarAttrDto> ownerCarAttrDto;
 
     public String getCarColor() {
         return carColor;
@@ -455,6 +464,7 @@
     public void setPaIds(String[] paIds) {
         this.paIds = paIds;
     }
+
     public String getCarTypeCdName() {
         return carTypeCdName;
     }
@@ -462,4 +472,68 @@
     public void setCarTypeCdName(String carTypeCdName) {
         this.carTypeCdName = carTypeCdName;
     }
+
+    public String[] getLeaseTypes() {
+        return leaseTypes;
+    }
+
+    public void setLeaseTypes(String[] leaseTypes) {
+        this.leaseTypes = leaseTypes;
+    }
+
+    public String getMemberCarCount() {
+        return memberCarCount;
+    }
+
+    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;
+    }
 }

--
Gitblit v1.8.0