From 0a9b6e565843bd25e5ef37e979c7da9bbf3df218 Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期五, 22 四月 2022 17:06:43 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity

---
 java110-bean/src/main/java/com/java110/dto/purchaseApply/PurchaseApplyDto.java |   92 +++++++++++++++++++++++++++++++++++++++++++++-
 1 files changed, 90 insertions(+), 2 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 555d295..a6a1d8d 100755
--- a/java110-bean/src/main/java/com/java110/dto/purchaseApply/PurchaseApplyDto.java
+++ b/java110-bean/src/main/java/com/java110/dto/purchaseApply/PurchaseApplyDto.java
@@ -26,6 +26,9 @@
     public static final String STATE_NOT_PASS = "1004"; // 鏈�氳繃
     public static final String WAREHOUSING_TYPE_DIRECT = "10000"; // 鐩存帴鍏ュ簱/鍑哄簱
     public static final String WAREHOUSING_TYPE_APPLY = "20000"; // 閲囪喘鐢宠鍏ュ簱/鍑哄簱
+    public static final String WAREHOUSING_TYPE_URGENT = "30000"; //绱ф�ラ噰璐叆搴�
+    public static final String WEIGHTED_MEAN_TRUE = "10000"; //璁$畻鍧囦环
+    public static final String WEIGHTED_MEAN_FALSE = "20000";
 
     private String resOrderType;
     private String description;
@@ -49,6 +52,7 @@
     private String auditMessage;
     private String staffId;
     private String staffName;
+    private String nextStaffId;
     private String staffTel;
     private String startUserId;
     private String warehousingWay;
@@ -56,6 +60,20 @@
     private String createUserName;
     private String price;
     private String supplierName;
+    private String communityId;
+
+    //涓嬬骇澶勭悊浜篿d
+    private String taskUserId;
+    private String actRuTaskId;
+    private String procDefId;
+    private String businessKey;
+    private String assigneeUser;
+
+    //鐘舵�佹爣璇�
+    private String noticeState;
+
+    //鏌ヨ褰撴湀鏁版嵁鏍囪瘑
+    private String urgentFlag;
 
     public String getResOrderType() {
         return resOrderType;
@@ -112,7 +130,6 @@
     public void setUserId(String userId) {
         this.userId = userId;
     }
-
 
     public String getCreateTime() {
         return createTime;
@@ -193,7 +210,6 @@
     public void setbId(String bId) {
         this.bId = bId;
     }
-
 
     public String getEndUserName() {
         return endUserName;
@@ -290,4 +306,76 @@
     public void setSupplierName(String supplierName) {
         this.supplierName = supplierName;
     }
+
+    public String getTaskUserId() {
+        return taskUserId;
+    }
+
+    public void setTaskUserId(String taskUserId) {
+        this.taskUserId = taskUserId;
+    }
+
+    public String getActRuTaskId() {
+        return actRuTaskId;
+    }
+
+    public void setActRuTaskId(String actRuTaskId) {
+        this.actRuTaskId = actRuTaskId;
+    }
+
+    public String getProcDefId() {
+        return procDefId;
+    }
+
+    public void setProcDefId(String procDefId) {
+        this.procDefId = procDefId;
+    }
+
+    public String getBusinessKey() {
+        return businessKey;
+    }
+
+    public void setBusinessKey(String businessKey) {
+        this.businessKey = businessKey;
+    }
+
+    public String getCommunityId() {
+        return communityId;
+    }
+
+    public void setCommunityId(String communityId) {
+        this.communityId = communityId;
+    }
+
+    public String getNoticeState() {
+        return noticeState;
+    }
+
+    public void setNoticeState(String noticeState) {
+        this.noticeState = noticeState;
+    }
+
+    public String getUrgentFlag() {
+        return urgentFlag;
+    }
+
+    public void setUrgentFlag(String urgentFlag) {
+        this.urgentFlag = urgentFlag;
+    }
+
+    public String getAssigneeUser() {
+        return assigneeUser;
+    }
+
+    public void setAssigneeUser(String assigneeUser) {
+        this.assigneeUser = assigneeUser;
+    }
+
+    public String getNextStaffId() {
+        return nextStaffId;
+    }
+
+    public void setNextStaffId(String nextStaffId) {
+        this.nextStaffId = nextStaffId;
+    }
 }

--
Gitblit v1.8.0