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/vo/api/purchaseApply/ApiPurchaseApplyDataVo.java |   97 ++++++++++++++++++++++++++++++++++++++++++++++--
 1 files changed, 93 insertions(+), 4 deletions(-)

diff --git a/java110-bean/src/main/java/com/java110/vo/api/purchaseApply/ApiPurchaseApplyDataVo.java b/java110-bean/src/main/java/com/java110/vo/api/purchaseApply/ApiPurchaseApplyDataVo.java
old mode 100644
new mode 100755
index ab95f0e..34b8698
--- a/java110-bean/src/main/java/com/java110/vo/api/purchaseApply/ApiPurchaseApplyDataVo.java
+++ b/java110-bean/src/main/java/com/java110/vo/api/purchaseApply/ApiPurchaseApplyDataVo.java
@@ -1,23 +1,32 @@
 package com.java110.vo.api.purchaseApply;
 
 import java.io.Serializable;
-import java.util.Date;
 import java.util.List;
 
 public class ApiPurchaseApplyDataVo implements Serializable {
 
     private String applyOrderId;
+    private String resOrderType;
     private String state;
     private String userName;
     private String stateName;
     //鐢宠鏃堕棿
-    private Date createTime;
+    private String createTime;
     //鐗╁搧鍚嶇О鏄�
     private String resourceNames;
     //绱浠锋牸
     private String totalPrice;
+    private String purchaseTotalPrice;
+    private String endUserName;
+    private String endUserTel;
     private List<PurchaseApplyDetailVo> purchaseApplyDetailVo;
     private String description;
+    private String staffId;
+    private String staffName;
+    private String staffTel;
+    private String warehousingWay;
+    private String createUserId;
+    private String createUserName;
 
 
     public String getApplyOrderId() {
@@ -44,11 +53,11 @@
         this.userName = userName;
     }
 
-    public Date getCreateTime() {
+    public String getCreateTime() {
         return createTime;
     }
 
-    public void setCreateTime(Date createTime) {
+    public void setCreateTime(String createTime) {
         this.createTime = createTime;
     }
 
@@ -91,4 +100,84 @@
     public void setDescription(String description) {
         this.description = description;
     }
+
+    public String getResOrderType() {
+        return resOrderType;
+    }
+
+    public void setResOrderType(String resOrderType) {
+        this.resOrderType = resOrderType;
+    }
+
+    public String getEndUserName() {
+        return endUserName;
+    }
+
+    public void setEndUserName(String endUserName) {
+        this.endUserName = endUserName;
+    }
+
+    public String getEndUserTel() {
+        return endUserTel;
+    }
+
+    public void setEndUserTel(String endUserTel) {
+        this.endUserTel = endUserTel;
+    }
+
+    public String getStaffId() {
+        return staffId;
+    }
+
+    public void setStaffId(String staffId) {
+        this.staffId = staffId;
+    }
+
+    public String getStaffName() {
+        return staffName;
+    }
+
+    public void setStaffName(String staffName) {
+        this.staffName = staffName;
+    }
+
+    public String getStaffTel() {
+        return staffTel;
+    }
+
+    public void setStaffTel(String staffTel) {
+        this.staffTel = staffTel;
+    }
+
+    public String getPurchaseTotalPrice() {
+        return purchaseTotalPrice;
+    }
+
+    public void setPurchaseTotalPrice(String purchaseTotalPrice) {
+        this.purchaseTotalPrice = purchaseTotalPrice;
+    }
+
+    public String getWarehousingWay() {
+        return warehousingWay;
+    }
+
+    public void setWarehousingWay(String warehousingWay) {
+        this.warehousingWay = warehousingWay;
+    }
+
+    public String getCreateUserId() {
+        return createUserId;
+    }
+
+    public void setCreateUserId(String createUserId) {
+        this.createUserId = createUserId;
+    }
+
+    public String getCreateUserName() {
+        return createUserName;
+    }
+
+    public void setCreateUserName(String createUserName) {
+        this.createUserName = createUserName;
+    }
 }

--
Gitblit v1.8.0