Merge branch 'master-base' into master-prod-new

fwq

2024-07-31 5fa87c35ad1c15b990d08e36a6c21471a4ab0c72

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

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

import com.hz.his.dto.refund.RefundPreferentialDto;
import lombok.Data;

import java.math.BigDecimal;
@@ -78,4 +79,7 @@
    //非必填 重发标识
    private String resendRecordId;

    /** 退款优惠 */
    private RefundPreferentialDto refundPreferentialDto;

}