From 576c52d8d8e6fb1e738380cc5fc101a6a2b0b3a8 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期六, 04 九月 2021 16:00: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 | 16 +++++++++++-----
1 files changed, 11 insertions(+), 5 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 0d5ff38..b9c8716
--- 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,7 +1,6 @@
package com.java110.dto.feeDiscount;
import com.java110.dto.PageDto;
-import com.java110.dto.feeDiscountSpec.FeeDiscountSpecDto;
import java.io.Serializable;
import java.util.Date;
@@ -17,13 +16,15 @@
**/
public class FeeDiscountDto extends PageDto implements Serializable {
- //绫诲瀷 1001 浼樻儬 2002 杩濈害
+ //绫诲瀷 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 discountTypeName;
private String discountId;
private String communityId;
private String ruleId;
@@ -34,11 +35,9 @@
private List<FeeDiscountSpecDto> feeDiscountSpecs;
-
private Date createTime;
private String statusCd = "0";
-
public String getDiscountName() {
return discountName;
@@ -87,7 +86,6 @@
public void setRuleId(String ruleId) {
this.ruleId = ruleId;
}
-
public Date getCreateTime() {
return createTime;
@@ -144,4 +142,12 @@
public void setCycles(double cycles) {
this.cycles = cycles;
}
+
+ public String getDiscountTypeName() {
+ return discountTypeName;
+ }
+
+ public void setDiscountTypeName(String discountTypeName) {
+ this.discountTypeName = discountTypeName;
+ }
}
--
Gitblit v1.8.0