Merge branch 'master-prod-new' into master-fwq抽奖配置

fwq

2023-10-07 9f6e37f3d6320fa5b3f4f30bc9bd7c357eeb96e7

 phis-feign/src/main/java/com/hz/his/dto/order/OrderItemSourceRefundDto.java

@@ -1,6 +1,6 @@
package com.hz.his.dto.order;

import com.hz.his.dto.order.refund.RefundPaymentMethodVo;
import com.hz.his.vo.order.refund.RefundDeductionCancelVo;
import lombok.Data;

import java.math.BigDecimal;
@@ -28,6 +28,10 @@
    /** 退款原因（用户） */
    private String refundReason;

    /**分配的退款方式金额-内部传参使用，接口暂时无用*/
    private List<RefundPaymentMethodVo> distributionPayList;
    /** 需要作废的划扣记录*/
    private List<RefundDeductionCancelVo> refundDeductionCancelList;

    /** 可退总金额（用于系统返回参数计算）*/
    private BigDecimal approveRefundTotal = BigDecimal.ZERO;

}