Merge remote-tracking branch 'origin/xinghong-dev'

java110

2020-12-10 634cea842c9a4f2ef1bddde07d7b5a334f0117de

 java110-bean/src/main/java/com/java110/dto/feeDiscount/ComputeDiscountDto.java

@@ -16,7 +16,7 @@
package com.java110.dto.feeDiscount;

import com.java110.dto.PageDto;
import com.java110.dto.feeDiscountRuleSpec.FeeDiscountRuleSpecDto;
import com.java110.dto.feeDiscountSpec.FeeDiscountSpecDto;

import java.io.Serializable;
import java.util.List;
@@ -30,11 +30,16 @@

    private String discountType;

    private String discountName;

    private String ruleName;

    private String ruleId;

    private List<FeeDiscountRuleSpecDto> feeDiscountRuleSpecs;
    //映射关系值
    private String value;

    private List<FeeDiscountSpecDto> feeDiscountSpecs;

    private double discountPrice;

@@ -63,12 +68,12 @@
        this.ruleId = ruleId;
    }

    public List<FeeDiscountRuleSpecDto> getFeeDiscountRuleSpecs() {
        return feeDiscountRuleSpecs;
    public List<FeeDiscountSpecDto> getFeeDiscountSpecs() {
        return feeDiscountSpecs;
    }

    public void setFeeDiscountRuleSpecs(List<FeeDiscountRuleSpecDto> feeDiscountRuleSpecs) {
        this.feeDiscountRuleSpecs = feeDiscountRuleSpecs;
    public void setFeeDiscountSpecs(List<FeeDiscountSpecDto> feeDiscountSpecs) {
        this.feeDiscountSpecs = feeDiscountSpecs;
    }

    public double getDiscountPrice() {
@@ -86,4 +91,20 @@
    public void setDiscountType(String discountType) {
        this.discountType = discountType;
    }

    public String getDiscountName() {
        return discountName;
    }

    public void setDiscountName(String discountName) {
        this.discountName = discountName;
    }

    public String getValue() {
        return value;
    }

    public void setValue(String value) {
        this.value = value;
    }
}