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

java110

2020-12-10 634cea842c9a4f2ef1bddde07d7b5a334f0117de

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

@@ -36,6 +36,9 @@

    private String ruleId;

    //映射关系值
    private String value;

    private List<FeeDiscountSpecDto> feeDiscountSpecs;

    private double discountPrice;
@@ -96,4 +99,12 @@
    public void setDiscountName(String discountName) {
        this.discountName = discountName;
    }

    public String getValue() {
        return value;
    }

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