From e74dade001072c3a0e93cd6d698df4df2262f5a3 Mon Sep 17 00:00:00 2001 From: chenjiahe <763432473@qq.com> Date: 星期四, 01 八月 2024 22:30:27 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master-base' into master-test --- phis-feign/src/main/java/com/hz/his/dto/order/PayDto.java | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/phis-feign/src/main/java/com/hz/his/dto/order/PayDto.java b/phis-feign/src/main/java/com/hz/his/dto/order/PayDto.java index 6f5dbaa..7d05760 100644 --- a/phis-feign/src/main/java/com/hz/his/dto/order/PayDto.java +++ b/phis-feign/src/main/java/com/hz/his/dto/order/PayDto.java @@ -45,7 +45,7 @@ private Integer couponCheckVersion = 0; /**闈炲繀濉� 浼樻儬鍒竔d闆嗗悎*/ private List<String> userCouponIds; - + /**ocr澶т紬鐐硅瘎璁㈠崟鍥剧墖鍦板潃*/ private String orderOCRImageUrl; @@ -61,6 +61,8 @@ /**闈炲繀濉� 鍙互鍙備笌绉垎鎶垫墸缁撹处鐨勫晢鍝佹爣璇�*/ private List<String> canIntegralCashIdList; + /**闈炲繀濉� 鍏朵粬鎴浘鎴栬�呮枃浠朵笂浼� **/ + private List<OrderOtherFilesDto> otherInfoFiles; /**缁撹处鍚庤禒閫�*/ private PaySendDto paySendDto; -- Gitblit v1.8.0