Merge branch 'master' into master-test

fwq

2023-06-26 fc9cac864414b566e3516f6702b716e8ed00e9dc

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

@@ -42,7 +42,13 @@
    private Integer couponCheckVersion = 0;
    /**非必填 优惠券id集合*/
    private List<String> userCouponIds;
    
    /**ocr大众点评订单图片地址*/
    private String orderOCRImageUrl;

    /**ocr 大众点评图片地址*/
    private String ocrImageUrl;
    /**第三方订单编号*/
    private String otherOrderNo;

    /**第三方兑换码*/
    private String redemptionCode;
}