From cdd0abecb96bb1b6dfa32e8a9cbb406ce3b4ed7d Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期四, 26 八月 2021 17:02:08 +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, 38 insertions(+), 4 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 8d1bb79..ecd30b5
--- 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;
@@ -34,12 +35,15 @@
private String stateName;
private String communityId;
private String discountId;
-
+ //鏄惁鍙敤
+ private String inUse;
+ private String discountName;
private Date createTime;
- private String statusCd = "0";
+ private String bId;
+ private String statusCd = "0";
public String getApplyType() {
return applyType;
@@ -56,7 +60,6 @@
public void setArdId(String ardId) {
this.ardId = ardId;
}
-
public String getCheckUserId() {
return checkUserId;
@@ -146,7 +149,6 @@
this.discountId = discountId;
}
-
public Date getCreateTime() {
return createTime;
}
@@ -194,4 +196,36 @@
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;
+ }
+
+ public String getbId() {
+ return bId;
+ }
+
+ public void setbId(String bId) {
+ this.bId = bId;
+ }
}
--
Gitblit v1.8.0