Merge branch 'master' into master-test

ANDRU-PC\Andru

2023-05-06 765007dcc802b0539124cb4c780de665e6665509

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

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

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

import java.math.BigDecimal;
@@ -19,19 +18,20 @@
    private String type;
    /** 商品名称 */
    private String goodsName;
    /** 实退数 */
    /** 实退数（客户填写） */
    private Integer refundNum;
    /** 实退金额 */
    /** 实退金额 （客户填写）*/
    private BigDecimal refundMoney;
    /** 退款原因（员工） */
    private String remarks;
    /** 退款原因（用户） */
    private String refundReason;

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

    /** 退款二级子订单信息集合 */
    private List<OrderItemSourceRefundDto> orderItemSourceRefundDtos;

    /**分配的退款方式金额-内部传参使用，接口暂时无用*/
    private List<RefundPaymentMethodVo> distributionPayList;

}