Merge branch 'master' into master-test

ANDRU-PC\Andru

2023-07-04 3bbfd6d4e0f3407c54fdbbe02b0f5ea298b582da

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

@@ -42,7 +42,14 @@
    private Integer couponCheckVersion = 0;
    /**非必填 优惠券id集合*/
    private List<String> userCouponIds;

    
    /**ocr大众点评订单图片地址*/
    private String orderOCRImageUrl;

    /**第三方订单编号*/
    private String otherOrderNo;
    /**第三方兑换码*/
    private String redemptionCode;
    /**结账之后是否直接划扣：0否1是*/
    private Integer directDeduction;
}