From 576c52d8d8e6fb1e738380cc5fc101a6a2b0b3a8 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期六, 04 九月 2021 16:00:57 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity

---
 java110-bean/src/main/java/com/java110/dto/order/OrderDto.java |   26 +++++++++++++++++++++-----
 1 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/java110-bean/src/main/java/com/java110/dto/order/OrderDto.java b/java110-bean/src/main/java/com/java110/dto/order/OrderDto.java
old mode 100644
new mode 100755
index 3520f97..16014a0
--- a/java110-bean/src/main/java/com/java110/dto/order/OrderDto.java
+++ b/java110-bean/src/main/java/com/java110/dto/order/OrderDto.java
@@ -6,12 +6,9 @@
 
 public class OrderDto extends PageDto implements Serializable {
 
-    public static final String APP_ID = "APP-ID";
-    public static final String TRANSACTION_ID = "TRANSACTION-ID";
-    public static final String REQUEST_TIME = "REQUEST-TIME";
-    public static final String USER_ID = "USER-ID";
 
-    public static final String O_ID = "O-ID";
+
+    public static final String O_ID = "o-id";
 
     //鍙楃悊鍗�
     public static final String ORDER_TYPE_DEAL = "D";
@@ -20,6 +17,7 @@
     private String appId;
     private String extTransactionId;
     private String userId;
+    private String userName;
     private String requestTime;
     private String orderTypeCd;
     private String finishTime;
@@ -28,10 +26,12 @@
     private String oId;
 
     private String bId;
+    private String statusCd;
 
     private String businessTypeCd;
 
     private String[] businessTypeCds;
+
 
 
     public String getoId() {
@@ -121,4 +121,20 @@
     public void setRemark(String remark) {
         this.remark = remark;
     }
+
+    public String getStatusCd() {
+        return statusCd;
+    }
+
+    public void setStatusCd(String statusCd) {
+        this.statusCd = statusCd;
+    }
+
+    public String getUserName() {
+        return userName;
+    }
+
+    public void setUserName(String userName) {
+        this.userName = userName;
+    }
 }

--
Gitblit v1.8.0