From 3b48383729e46bbd4ab0a2867df497489acb4338 Mon Sep 17 00:00:00 2001
From: fhx <308050795@qq.com>
Date: 星期二, 15 八月 2023 15:10:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master-test' into master-test

---
 phis-feign/src/main/java/com/hz/his/dto/order/PayDto.java |    2 +-
 1 files changed, 1 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 a8b6967..543ace4 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
@@ -42,7 +42,7 @@
     private Integer couponCheckVersion = 0;
     /**闈炲繀濉� 浼樻儬鍒竔d闆嗗悎*/
     private List<String> userCouponIds;
-
+    
     /**ocr澶т紬鐐硅瘎璁㈠崟鍥剧墖鍦板潃*/
     private String orderOCRImageUrl;
 

--
Gitblit v1.8.0