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/payFeeDetailDiscount/PayFeeDetailDiscountDto.java |  100 ++++++++++++++++++++++++++++++++++++++++---------
 1 files changed, 81 insertions(+), 19 deletions(-)

diff --git a/java110-bean/src/main/java/com/java110/dto/payFeeDetailDiscount/PayFeeDetailDiscountDto.java b/java110-bean/src/main/java/com/java110/dto/payFeeDetailDiscount/PayFeeDetailDiscountDto.java
old mode 100644
new mode 100755
index 41d13c6..1b362d8
--- a/java110-bean/src/main/java/com/java110/dto/payFeeDetailDiscount/PayFeeDetailDiscountDto.java
+++ b/java110-bean/src/main/java/com/java110/dto/payFeeDetailDiscount/PayFeeDetailDiscountDto.java
@@ -1,8 +1,11 @@
 package com.java110.dto.payFeeDetailDiscount;
 
 import com.java110.dto.PageDto;
+import com.java110.dto.feeDiscount.FeeDiscountSpecDto;
+
 import java.io.Serializable;
 import java.util.Date;
+import java.util.List;
 
 /**
  * @ClassName FloorDto
@@ -15,12 +18,18 @@
 public class PayFeeDetailDiscountDto extends PageDto implements Serializable {
 
     private String detailDiscountId;
-private String discountPrice;
-private String detailId;
-private String remark;
-private String communityId;
-private String discountId;
-private String feeId;
+    private String discountPrice;
+    private String detailId;
+    private String remark;
+    private String communityId;
+    private String discountId;
+    private String discountName;
+    private String discountType;
+    private String feeId;
+    private String bId;
+    private String ruleName;
+
+    private List<FeeDiscountSpecDto> feeDiscountSpecs;
 
 
     private Date createTime;
@@ -31,43 +40,56 @@
     public String getDetailDiscountId() {
         return detailDiscountId;
     }
-public void setDetailDiscountId(String detailDiscountId) {
+
+    public void setDetailDiscountId(String detailDiscountId) {
         this.detailDiscountId = detailDiscountId;
     }
-public String getDiscountPrice() {
+
+    public String getDiscountPrice() {
         return discountPrice;
     }
-public void setDiscountPrice(String discountPrice) {
+
+    public void setDiscountPrice(String discountPrice) {
         this.discountPrice = discountPrice;
     }
-public String getDetailId() {
+
+    public String getDetailId() {
         return detailId;
     }
-public void setDetailId(String detailId) {
+
+    public void setDetailId(String detailId) {
         this.detailId = detailId;
     }
-public String getRemark() {
+
+    public String getRemark() {
         return remark;
     }
-public void setRemark(String remark) {
+
+    public void setRemark(String remark) {
         this.remark = remark;
     }
-public String getCommunityId() {
+
+    public String getCommunityId() {
         return communityId;
     }
-public void setCommunityId(String communityId) {
+
+    public void setCommunityId(String communityId) {
         this.communityId = communityId;
     }
-public String getDiscountId() {
+
+    public String getDiscountId() {
         return discountId;
     }
-public void setDiscountId(String discountId) {
+
+    public void setDiscountId(String discountId) {
         this.discountId = discountId;
     }
-public String getFeeId() {
+
+    public String getFeeId() {
         return feeId;
     }
-public void setFeeId(String feeId) {
+
+    public void setFeeId(String feeId) {
         this.feeId = feeId;
     }
 
@@ -87,4 +109,44 @@
     public void setStatusCd(String statusCd) {
         this.statusCd = statusCd;
     }
+
+    public List<FeeDiscountSpecDto> getFeeDiscountSpecs() {
+        return feeDiscountSpecs;
+    }
+
+    public void setFeeDiscountSpecs(List<FeeDiscountSpecDto> feeDiscountSpecs) {
+        this.feeDiscountSpecs = feeDiscountSpecs;
+    }
+
+    public String getDiscountName() {
+        return discountName;
+    }
+
+    public void setDiscountName(String discountName) {
+        this.discountName = discountName;
+    }
+
+    public String getDiscountType() {
+        return discountType;
+    }
+
+    public void setDiscountType(String discountType) {
+        this.discountType = discountType;
+    }
+
+    public String getbId() {
+        return bId;
+    }
+
+    public void setbId(String bId) {
+        this.bId = bId;
+    }
+
+    public String getRuleName() {
+        return ruleName;
+    }
+
+    public void setRuleName(String ruleName) {
+        this.ruleName = ruleName;
+    }
 }

--
Gitblit v1.8.0