Merge branch 'master-zhangxu' into master-test

zhangxu

2022-12-06 b6102728f433cfeb302661a4bff1ab069d182bf0

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

@@ -16,6 +16,10 @@
    /** 实退金额 */
    private BigDecimal money;

    /** 备注 */
    private String remarks;


    public OrderPayMethodDto() {
    }