Merge branch 'master-prod-new' into master-test

chenjiahe

2023-07-04 e5698522636ac41a7eec7e3935fff6204e771398

Merge branch 'master-prod-new' into master-test

 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;
}