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/parkingCouponCar/ParkingCouponCarDto.java | 185 ++++++++++++++++++++++++++++++++++++----------
1 files changed, 145 insertions(+), 40 deletions(-)
diff --git a/java110-bean/src/main/java/com/java110/dto/parkingCouponCar/ParkingCouponCarDto.java b/java110-bean/src/main/java/com/java110/dto/parkingCouponCar/ParkingCouponCarDto.java
index 57eec01..d0e4a10 100644
--- a/java110-bean/src/main/java/com/java110/dto/parkingCouponCar/ParkingCouponCarDto.java
+++ b/java110-bean/src/main/java/com/java110/dto/parkingCouponCar/ParkingCouponCarDto.java
@@ -1,6 +1,7 @@
package com.java110.dto.parkingCouponCar;
import com.java110.dto.PageDto;
+
import java.io.Serializable;
import java.util.Date;
@@ -14,20 +15,33 @@
**/
public class ParkingCouponCarDto extends PageDto implements Serializable {
+ //鐘舵�� 1001 鏈娇鐢� 2002 宸蹭娇鐢� 3003 浣滃簾
+ public static final String STATE_WAIT = "1001";
+ public static final String STATE_FINISH = "2002";
+
private String giveWay;
-private String carNum;
-private String couponShopId;
-private String remark;
-private String couponId;
-private String pccId;
-private String typeCd;
-private String paId;
-private String startTime;
-private String shopId;
-private String state;
-private String endTime;
-private String communityId;
-private String value;
+ private String giveWayName;
+
+ private String carNum;
+ private String carNumLike;
+ private String couponShopId;
+ private String remark;
+ private String couponId;
+ private String couponName;
+ private String pccId;
+ private String typeCd;
+ private String typeCdName;
+ private String paId;
+ private String paName;
+ private String startTime;
+ private String shopId;
+ private String shopName;
+ private String shopNameLike;
+ private String state;
+ private String stateName;
+ private String endTime;
+ private String communityId;
+ private String value;
private Date createTime;
@@ -38,85 +52,112 @@
public String getGiveWay() {
return giveWay;
}
-public void setGiveWay(String giveWay) {
+
+ public void setGiveWay(String giveWay) {
this.giveWay = giveWay;
}
-public String getCarNum() {
+
+ public String getCarNum() {
return carNum;
}
-public void setCarNum(String carNum) {
+
+ public void setCarNum(String carNum) {
this.carNum = carNum;
}
-public String getCouponShopId() {
+
+ public String getCouponShopId() {
return couponShopId;
}
-public void setCouponShopId(String couponShopId) {
+
+ public void setCouponShopId(String couponShopId) {
this.couponShopId = couponShopId;
}
-public String getRemark() {
+
+ public String getRemark() {
return remark;
}
-public void setRemark(String remark) {
+
+ public void setRemark(String remark) {
this.remark = remark;
}
-public String getCouponId() {
+
+ public String getCouponId() {
return couponId;
}
-public void setCouponId(String couponId) {
+
+ public void setCouponId(String couponId) {
this.couponId = couponId;
}
-public String getPccId() {
+
+ public String getPccId() {
return pccId;
}
-public void setPccId(String pccId) {
+
+ public void setPccId(String pccId) {
this.pccId = pccId;
}
-public String getTypeCd() {
+
+ public String getTypeCd() {
return typeCd;
}
-public void setTypeCd(String typeCd) {
+
+ public void setTypeCd(String typeCd) {
this.typeCd = typeCd;
}
-public String getPaId() {
+
+ public String getPaId() {
return paId;
}
-public void setPaId(String paId) {
+
+ public void setPaId(String paId) {
this.paId = paId;
}
-public String getStartTime() {
+
+ public String getStartTime() {
return startTime;
}
-public void setStartTime(String startTime) {
+
+ public void setStartTime(String startTime) {
this.startTime = startTime;
}
-public String getShopId() {
+
+ public String getShopId() {
return shopId;
}
-public void setShopId(String shopId) {
+
+ public void setShopId(String shopId) {
this.shopId = shopId;
}
-public String getState() {
+
+ public String getState() {
return state;
}
-public void setState(String state) {
+
+ public void setState(String state) {
this.state = state;
}
-public String getEndTime() {
+
+ public String getEndTime() {
return endTime;
}
-public void setEndTime(String endTime) {
+
+ public void setEndTime(String endTime) {
this.endTime = endTime;
}
-public String getCommunityId() {
+
+ public String getCommunityId() {
return communityId;
}
-public void setCommunityId(String communityId) {
+
+ public void setCommunityId(String communityId) {
this.communityId = communityId;
}
-public String getValue() {
+
+ public String getValue() {
return value;
}
-public void setValue(String value) {
+
+ public void setValue(String value) {
this.value = value;
}
@@ -136,4 +177,68 @@
public void setStatusCd(String statusCd) {
this.statusCd = statusCd;
}
+
+ public String getTypeCdName() {
+ return typeCdName;
+ }
+
+ public void setTypeCdName(String typeCdName) {
+ this.typeCdName = typeCdName;
+ }
+
+ public String getPaName() {
+ return paName;
+ }
+
+ public void setPaName(String paName) {
+ this.paName = paName;
+ }
+
+ public String getShopName() {
+ return shopName;
+ }
+
+ public void setShopName(String shopName) {
+ this.shopName = shopName;
+ }
+
+ public String getStateName() {
+ return stateName;
+ }
+
+ public void setStateName(String stateName) {
+ this.stateName = stateName;
+ }
+
+ public String getCarNumLike() {
+ return carNumLike;
+ }
+
+ public void setCarNumLike(String carNumLike) {
+ this.carNumLike = carNumLike;
+ }
+
+ public String getShopNameLike() {
+ return shopNameLike;
+ }
+
+ public void setShopNameLike(String shopNameLike) {
+ this.shopNameLike = shopNameLike;
+ }
+
+ public String getCouponName() {
+ return couponName;
+ }
+
+ public void setCouponName(String couponName) {
+ this.couponName = couponName;
+ }
+
+ public String getGiveWayName() {
+ return giveWayName;
+ }
+
+ public void setGiveWayName(String giveWayName) {
+ this.giveWayName = giveWayName;
+ }
}
--
Gitblit v1.8.0