From 755262ba9a1a3c0573a0e910bbd0a353e9e2a2c5 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期三, 16 六月 2021 16:39:57 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity

---
 java110-bean/src/main/java/com/java110/dto/feeDiscount/FeeDiscountDto.java |   96 ++++++++++++++++++++++++++++++++++++++++--------
 1 files changed, 80 insertions(+), 16 deletions(-)

diff --git a/java110-bean/src/main/java/com/java110/dto/feeDiscount/FeeDiscountDto.java b/java110-bean/src/main/java/com/java110/dto/feeDiscount/FeeDiscountDto.java
old mode 100644
new mode 100755
index c8686a4..82faac1
--- a/java110-bean/src/main/java/com/java110/dto/feeDiscount/FeeDiscountDto.java
+++ b/java110-bean/src/main/java/com/java110/dto/feeDiscount/FeeDiscountDto.java
@@ -1,8 +1,10 @@
 package com.java110.dto.feeDiscount;
 
 import com.java110.dto.PageDto;
+
 import java.io.Serializable;
 import java.util.Date;
+import java.util.List;
 
 /**
  * @ClassName FloorDto
@@ -14,12 +16,23 @@
  **/
 public class FeeDiscountDto extends PageDto implements Serializable {
 
+    //绫诲瀷 1001 浼樻儬  2002 杩濈害  3003 浼樻儬(闇�瑕佺敵璇�)
+    public static final String DISCOUNT_TYPE_D = "1001"; //浼樻儬
+    public static final String DISCOUNT_TYPE_V = "2002"; //杩濈害
+    public static final String DISCOUNT_TYPE_DV = "3003"; //浼樻儬(闇�瑕佺敵璇�)
+
     private String discountName;
-private String discountDesc;
-private String discountType;
-private String discountId;
-private String communityId;
-private String ruleId;
+    private String discountDesc;
+    private String discountType;
+    private String discountId;
+    private String communityId;
+    private String ruleId;
+    private String ruleName;
+    private String beanImpl;
+    private String feeId;
+    private double cycles;
+
+    private List<FeeDiscountSpecDto> feeDiscountSpecs;
 
 
     private Date createTime;
@@ -30,37 +43,48 @@
     public String getDiscountName() {
         return discountName;
     }
-public void setDiscountName(String discountName) {
+
+    public void setDiscountName(String discountName) {
         this.discountName = discountName;
     }
-public String getDiscountDesc() {
+
+    public String getDiscountDesc() {
         return discountDesc;
     }
-public void setDiscountDesc(String discountDesc) {
+
+    public void setDiscountDesc(String discountDesc) {
         this.discountDesc = discountDesc;
     }
-public String getDiscountType() {
+
+    public String getDiscountType() {
         return discountType;
     }
-public void setDiscountType(String discountType) {
+
+    public void setDiscountType(String discountType) {
         this.discountType = discountType;
     }
-public String getDiscountId() {
+
+    public String getDiscountId() {
         return discountId;
     }
-public void setDiscountId(String discountId) {
+
+    public void setDiscountId(String discountId) {
         this.discountId = discountId;
     }
-public String getCommunityId() {
+
+    public String getCommunityId() {
         return communityId;
     }
-public void setCommunityId(String communityId) {
+
+    public void setCommunityId(String communityId) {
         this.communityId = communityId;
     }
-public String getRuleId() {
+
+    public String getRuleId() {
         return ruleId;
     }
-public void setRuleId(String ruleId) {
+
+    public void setRuleId(String ruleId) {
         this.ruleId = ruleId;
     }
 
@@ -80,4 +104,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 getRuleName() {
+        return ruleName;
+    }
+
+    public void setRuleName(String ruleName) {
+        this.ruleName = ruleName;
+    }
+
+    public String getBeanImpl() {
+        return beanImpl;
+    }
+
+    public void setBeanImpl(String beanImpl) {
+        this.beanImpl = beanImpl;
+    }
+
+    public String getFeeId() {
+        return feeId;
+    }
+
+    public void setFeeId(String feeId) {
+        this.feeId = feeId;
+    }
+
+    public double getCycles() {
+        return cycles;
+    }
+
+    public void setCycles(double cycles) {
+        this.cycles = cycles;
+    }
 }

--
Gitblit v1.8.0