From a20310f135ebf1c8ccff2b619f3eff3d704436a0 Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: 星期四, 08 十二月 2022 13:12:03 +0800
Subject: [PATCH] Merge branch 'xinghong-dev' of http://git.homecommunity.cn/supervip/MicroCommunity
---
java110-bean/src/main/java/com/java110/dto/owner/OwnerCarDto.java | 59 +++++++++++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 55 insertions(+), 4 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 0a7d80c..7aaea8f 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.RoomAttrDto;
import com.java110.dto.ownerCarAttr.OwnerCarAttrDto;
import java.io.Serializable;
@@ -22,12 +21,19 @@
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"; //涓存椂杞�
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_TEMP = "T";//涓存椂杞�
private String carColor;
private String carBrand;
@@ -39,6 +45,7 @@
private String communityId;
private String psId;
private String[] psIds;
+ private String[] paIds;
private String remark;
private String ownerId;
private String userId;
@@ -72,6 +79,7 @@
private String bId;
private String carTypeCd;
+ private String carTypeCdName;
private String[] carTypeCds;
private String memberId;
private String unitId;
@@ -80,8 +88,12 @@
private String roomNum;
private String oweAmount;
- private List<OwnerCarAttrDto> ownerCarAttrDto;
+ private String leaseType;
+ private String[] leaseTypes;
+ private String leaseTypeName;
+
+ private List<OwnerCarAttrDto> ownerCarAttrDto;
public String getCarColor() {
return carColor;
@@ -154,7 +166,6 @@
public void setCarId(String carId) {
this.carId = carId;
}
-
public Date getCreateTime() {
return createTime;
@@ -419,4 +430,44 @@
public void setOwnerCarAttrDto(List<OwnerCarAttrDto> ownerCarAttrDto) {
this.ownerCarAttrDto = ownerCarAttrDto;
}
+
+ public String getLeaseType() {
+ return leaseType;
+ }
+
+ public void setLeaseType(String leaseType) {
+ this.leaseType = leaseType;
+ }
+
+ public String getLeaseTypeName() {
+ return leaseTypeName;
+ }
+
+ public void setLeaseTypeName(String leaseTypeName) {
+ this.leaseTypeName = leaseTypeName;
+ }
+
+ public String[] getPaIds() {
+ return paIds;
+ }
+
+ public void setPaIds(String[] paIds) {
+ this.paIds = paIds;
+ }
+
+ public String getCarTypeCdName() {
+ return carTypeCdName;
+ }
+
+ public void setCarTypeCdName(String carTypeCdName) {
+ this.carTypeCdName = carTypeCdName;
+ }
+
+ public String[] getLeaseTypes() {
+ return leaseTypes;
+ }
+
+ public void setLeaseTypes(String[] leaseTypes) {
+ this.leaseTypes = leaseTypes;
+ }
}
--
Gitblit v1.8.0