From c083b87a2635d9b48dd95cb441d7a7c5c9258abe Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期三, 21 四月 2021 18:03:15 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity

---
 java110-bean/src/main/java/com/java110/dto/purchaseApply/PurchaseApplyDto.java |   57 +++++++++++++++++++++++++++++++++++++++++++++++++++------
 1 files changed, 51 insertions(+), 6 deletions(-)

diff --git a/java110-bean/src/main/java/com/java110/dto/purchaseApply/PurchaseApplyDto.java b/java110-bean/src/main/java/com/java110/dto/purchaseApply/PurchaseApplyDto.java
index 7b32963..d5bf2e0 100644
--- a/java110-bean/src/main/java/com/java110/dto/purchaseApply/PurchaseApplyDto.java
+++ b/java110-bean/src/main/java/com/java110/dto/purchaseApply/PurchaseApplyDto.java
@@ -17,9 +17,15 @@
  **/
 public class PurchaseApplyDto extends PageDto implements Serializable {
 
+    public static final String RES_ORDER_TYPE_ENTER = "10000"; //閲囪喘鍏ュ簱
+    public static final String RES_ORDER_TYPE_OUT = "20000"; //鍑哄簱
+    public static final String STATE_WAIT_DEAL = "1000"; // 绛夊緟澶勭悊
+    public static final String STATE_DEALING = "1001"; // 瀹℃牳涓�
+
     private String resOrderType;
     private String description;
     private String applyOrderId;
+    private String[] applyOrderIds;
     private String bId;
     private String state;
     private String storeId;
@@ -29,19 +35,17 @@
     private String endUserName;
     private String endUserTel;
     private List<PurchaseApplyDetailVo> purchaseApplyDetailVo;
-
     private String createTime;
-
     private String statusCd = "0";
-
     private String currentUserId;
     private String processInstanceId;
     private String taskId;
     private String auditCode;
     private String auditMessage;
-
-
-
+    private String staffId;
+    private String staffName;
+    private String staffTel;
+    private String startUserId;
 
     public String getResOrderType() {
         return resOrderType;
@@ -196,4 +200,45 @@
     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[] getApplyOrderIds() {
+        return applyOrderIds;
+    }
+
+    public void setApplyOrderIds(String[] applyOrderIds) {
+        this.applyOrderIds = applyOrderIds;
+    }
+
+    public String getStartUserId() {
+        return startUserId;
+    }
+
+    public void setStartUserId(String startUserId) {
+        this.startUserId = startUserId;
+    }
+
 }

--
Gitblit v1.8.0