Merge branch 'master' into master-test

zhangxu

2022-11-28 fcb2eabd3aacca24da4aef940fe471e95b28b8a2

Merge branch 'master' into master-test

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

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

    /** 备注 */
    private String remarks;


    public OrderPayMethodDto() {
    }