Merge remote-tracking branch 'origin/master-test' into master-test

fhx

2023-08-15 3b48383729e46bbd4ab0a2867df497489acb4338

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

@@ -50,6 +50,9 @@
    private String otherOrderNo;
    /**第三方兑换码*/
    private String redemptionCode;

    /**结账之后是否直接划扣：0否1是*/
    private Integer directDeduction = 0;
    /**卡扣不判断过期时间：0否1是*/
    private Integer cardPass = 0;
}