From ad4edbbf6ad2f20df3c21e60798ea649a47289ff Mon Sep 17 00:00:00 2001
From: fhx <308050795@qq.com>
Date: 星期二, 08 八月 2023 16:47:57 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master-test' into master-test
---
phis-feign/src/main/java/com/hz/phis/vo/payment/qr/OrderQrPayVo.java | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/phis-feign/src/main/java/com/hz/phis/vo/payment/qr/OrderQrVo.java b/phis-feign/src/main/java/com/hz/phis/vo/payment/qr/OrderQrPayVo.java
similarity index 97%
rename from phis-feign/src/main/java/com/hz/phis/vo/payment/qr/OrderQrVo.java
rename to phis-feign/src/main/java/com/hz/phis/vo/payment/qr/OrderQrPayVo.java
index e58b107..6b98361 100644
--- a/phis-feign/src/main/java/com/hz/phis/vo/payment/qr/OrderQrVo.java
+++ b/phis-feign/src/main/java/com/hz/phis/vo/payment/qr/OrderQrPayVo.java
@@ -8,7 +8,7 @@
* @author CJH
*/
@Data
-public class OrderQrVo {
+public class OrderQrPayVo {
/**N-32-绗笁鏂瑰晢鎴峰彿锛屾病鏈夋寚瀹氬彲涓嶄紶*/
private String merId;
--
Gitblit v1.8.0