ANDRU-PC\Andru
2023-05-25 399a1db79c985322bf8cf48026385aeba8285fc7
Merge branch 'master' into master-test

# Conflicts:
# phis-feign/src/main/java/com/hz/his/dto/order/PayDto.java
1个文件已修改
6 ■■■■ 已修改文件
phis-feign/src/main/java/com/hz/his/dto/order/PayDto.java 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
phis-feign/src/main/java/com/hz/his/dto/order/PayDto.java
@@ -42,7 +42,7 @@
    private Integer couponCheckVersion = 0;
    /**非必填 优惠券id集合*/
    private List<String> userCouponIds;
    /**ocr 大众点评图片地址*/
    private String ocrImageUrl;
    /**ocr大众点评订单图片地址*/
    private String orderOCRImageUrl;
}