Merge branch 'master' into master-test

wangrenhuang

2023-07-16 3de90089345a2bb8c18114885a8d7dcd58a432ce

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

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

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

import java.math.BigDecimal;
import java.util.List;

/**
 * @Author
@@ -28,6 +26,8 @@
    /** 退款原因（用户） */
    private String refundReason;

    /**分配的退款方式金额-内部传参使用，接口暂时无用*/
    private List<RefundPaymentMethodVo> distributionPayList;
    /////用于系统返回参数计算
    /** 可退总金额*/
    private BigDecimal approveRefundTotal = BigDecimal.ZERO;

}