From 4dbf61c9189796ec46d39ac4b839cfc064e70411 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期四, 12 八月 2021 16:11:16 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity
---
java110-bean/src/main/java/com/java110/dto/applyRoomDiscount/ApplyRoomDiscountDto.java | 42 +++++++++++++++++++++++++++++++++++++-----
1 files changed, 37 insertions(+), 5 deletions(-)
diff --git a/java110-bean/src/main/java/com/java110/dto/applyRoomDiscount/ApplyRoomDiscountDto.java b/java110-bean/src/main/java/com/java110/dto/applyRoomDiscount/ApplyRoomDiscountDto.java
old mode 100644
new mode 100755
index 79be3f0..1aedb6a
--- a/java110-bean/src/main/java/com/java110/dto/applyRoomDiscount/ApplyRoomDiscountDto.java
+++ b/java110-bean/src/main/java/com/java110/dto/applyRoomDiscount/ApplyRoomDiscountDto.java
@@ -18,6 +18,7 @@
public static final String STATE_APPLY = "1";//鐢宠楠屾埧
private String applyType;
+ private String applyTypeName;
private String ardId;
private String createUserName;
private String createUserTel;
@@ -31,14 +32,16 @@
private String startTime;
private String endTime;
private String state;
+ private String stateName;
private String communityId;
private String discountId;
-
+ //鏄惁鍙敤
+ private String inUse;
+ private String discountName;
private Date createTime;
private String statusCd = "0";
-
public String getApplyType() {
return applyType;
@@ -55,8 +58,6 @@
public void setArdId(String ardId) {
this.ardId = ardId;
}
-
-
public String getCheckUserId() {
return checkUserId;
@@ -146,7 +147,6 @@
this.discountId = discountId;
}
-
public Date getCreateTime() {
return createTime;
}
@@ -186,4 +186,36 @@
public void setCreateRemark(String createRemark) {
this.createRemark = createRemark;
}
+
+ public String getStateName() {
+ return stateName;
+ }
+
+ public void setStateName(String stateName) {
+ this.stateName = stateName;
+ }
+
+ public String getApplyTypeName() {
+ return applyTypeName;
+ }
+
+ public void setApplyTypeName(String applyTypeName) {
+ this.applyTypeName = applyTypeName;
+ }
+
+ public String getInUse() {
+ return inUse;
+ }
+
+ public void setInUse(String inUse) {
+ this.inUse = inUse;
+ }
+
+ public String getDiscountName() {
+ return discountName;
+ }
+
+ public void setDiscountName(String discountName) {
+ this.discountName = discountName;
+ }
}
--
Gitblit v1.8.0