Merge branch 'master' into master-test

wangrenhuang

2023-07-04 4bdc33f61729aa5387df5ef41e04f66dca1a35b0

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

@@ -51,5 +51,5 @@
    /**第三方兑换码*/
    private String redemptionCode;
    /**结账之后是否直接划扣：0否1是*/
    private Integer directDeduction;
    private Integer directDeduction = 0;
}