From 597cae7743fde0ca86efb4659a2ded937fc308ae Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期二, 19 一月 2021 00:32:28 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity

---
 java110-bean/src/main/java/com/java110/dto/feeDiscount/FeeDiscountDto.java |   23 +++++++++++++++++++++++
 1 files changed, 23 insertions(+), 0 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
index 286337e..0350d17 100644
--- a/java110-bean/src/main/java/com/java110/dto/feeDiscount/FeeDiscountDto.java
+++ b/java110-bean/src/main/java/com/java110/dto/feeDiscount/FeeDiscountDto.java
@@ -17,6 +17,11 @@
  **/
 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;
@@ -25,6 +30,8 @@
     private String ruleId;
     private String ruleName;
     private String beanImpl;
+    private String feeId;
+    private double cycles;
 
     private List<FeeDiscountSpecDto> feeDiscountSpecs;
 
@@ -122,4 +129,20 @@
     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