Merge branch 'master-base' into master-test

fhx

2024-08-02 bc798685f11aeec95e64c25b0a4594d8876d881d

Merge branch 'master-base' into master-test

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

@@ -3,6 +3,7 @@
import lombok.Data;

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

/**
 * @author wzh
@@ -39,6 +40,9 @@
    /** 备注 */
    private String remarks;

    /** 其他退款方式 */
    private List<OrderPayMethodDto> otherRefundMethodList;


    public OrderPayMethodDto() {
    }