From a834326805b2ca86c54437a22bb41a23eceace3f Mon Sep 17 00:00:00 2001
From: Hentua <wangdoubleone@gmail.com>
Date: Fri, 10 Nov 2023 18:08:43 +0800
Subject: [PATCH] Merge branch 'blnka' of http://120.27.238.55:7000/r/xc-mall into blnka

---
 src/main/java/cc/mrbird/febs/mall/vo/AdminOrderDetailVo.java |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/main/java/cc/mrbird/febs/mall/vo/AdminOrderDetailVo.java b/src/main/java/cc/mrbird/febs/mall/vo/AdminOrderDetailVo.java
index 66c6915..059b04b 100644
--- a/src/main/java/cc/mrbird/febs/mall/vo/AdminOrderDetailVo.java
+++ b/src/main/java/cc/mrbird/febs/mall/vo/AdminOrderDetailVo.java
@@ -20,8 +20,6 @@
 
     private String payMethod;
 
-    private String payOrderNo;
-
     private String payResult;
 
     /**
@@ -41,6 +39,8 @@
     private String phone;
 
     private String address;
+    private String addressArea;
+    private String addressInfo;
 
     private String longitude;
 
@@ -64,4 +64,8 @@
 
     private String orderItems;
 
+    private String payImage;
+
+    private String payOrderNo;
+
 }

--
Gitblit v1.9.1