Merge branch 'master' into master-test

wangrenhuang

2023-03-23 fcf8b677cf0a8165da424b642a9ade51aa91e7e9

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

@@ -13,9 +13,21 @@

    /** 支付方式编码 */
    private String payMethodNo;
    /** 实退金额 */
    /** 支付方式名称 */
    private String payMethodName;
    /** 支付金额 */
    private BigDecimal payTotal;
    /** 转换方式编码 （实际退款方式编码） */
    private String refundNumberNo;
    /** 转换方式名称 （实际退款方式编码）*/
    private String refundNumberName;
    /** 转换实退金额 （实际退款金额）*/
    private BigDecimal money;

    /** 备注 */
    private String remarks;


    public OrderPayMethodDto() {
    }