From c8195a8a1c34b9fa8db9aa4dc340d4344044ce97 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期二, 29 六月 2021 20:52:03 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity

---
 java110-bean/src/main/java/com/java110/dto/allocationStorehouse/AllocationStorehouseDto.java |   29 +++++++++++++++++++++++++----
 1 files changed, 25 insertions(+), 4 deletions(-)

diff --git a/java110-bean/src/main/java/com/java110/dto/allocationStorehouse/AllocationStorehouseDto.java b/java110-bean/src/main/java/com/java110/dto/allocationStorehouse/AllocationStorehouseDto.java
index fea4698..edd057b 100644
--- a/java110-bean/src/main/java/com/java110/dto/allocationStorehouse/AllocationStorehouseDto.java
+++ b/java110-bean/src/main/java/com/java110/dto/allocationStorehouse/AllocationStorehouseDto.java
@@ -14,10 +14,12 @@
  * add by wuxw 2019/4/24
  **/
 public class AllocationStorehouseDto extends PageDto implements Serializable {
-    public static final String STATE_APPLY = "1200";//鐘舵�侊紝1200 璋冩嫧鐢宠 1201 璋冩嫧瀹℃牳 1202 璋冩嫧瀹屾垚 1203 璋冩嫧澶辫触
-    public static final String STATE_AUDIT = "1201";//鐘舵�侊紝1200 璋冩嫧鐢宠 1201 璋冩嫧瀹℃牳 1202 璋冩嫧瀹屾垚 1203 璋冩嫧澶辫触
-    public static final String STATE_SUCCESS = "1202";//鐘舵�侊紝1200 璋冩嫧鐢宠 1201 璋冩嫧瀹℃牳 1202 璋冩嫧瀹屾垚 1203 璋冩嫧澶辫触
-    public static final String STATE_FAIL = "1203";//鐘舵�侊紝1200 璋冩嫧鐢宠 1201 璋冩嫧瀹℃牳 1202 璋冩嫧瀹屾垚 1203 璋冩嫧澶辫触
+    public static final String STATE_APPLY = "1200";//鐘舵�侊紝1200 璋冩嫧鐢宠 1201 璋冩嫧瀹℃牳 1202 璋冩嫧瀹屾垚 1203 璋冩嫧澶辫触 1204 璋冩嫧宸插鏍� 1205 宸查��杩�
+    public static final String STATE_AUDIT = "1201";//鐘舵�侊紝1200 璋冩嫧鐢宠 1201 璋冩嫧瀹℃牳 1202 璋冩嫧瀹屾垚 1203 璋冩嫧澶辫触 1204 璋冩嫧宸插鏍� 1205 宸查��杩�
+    public static final String STATE_SUCCESS = "1202";//鐘舵�侊紝1200 璋冩嫧鐢宠 1201 璋冩嫧瀹℃牳 1202 璋冩嫧瀹屾垚 1203 璋冩嫧澶辫触 1204 璋冩嫧宸插鏍� 1205 宸查��杩�
+    public static final String STATE_FAIL = "1203";//鐘舵�侊紝1200 璋冩嫧鐢宠 1201 璋冩嫧瀹℃牳 1202 璋冩嫧瀹屾垚 1203 璋冩嫧澶辫触 1204 璋冩嫧宸插鏍� 1205 宸查��杩�
+    public static final String STATE_REVIEWED = "1204";//鐘舵�侊紝1200 璋冩嫧鐢宠 1201 璋冩嫧瀹℃牳 1202 璋冩嫧瀹屾垚 1203 璋冩嫧澶辫触 1204 璋冩嫧宸插鏍� 1205 宸查��杩�
+    public static final String STATE_RETURN = "1205";//鐘舵�侊紝1200 璋冩嫧鐢宠 1201 璋冩嫧瀹℃牳 1202 璋冩嫧瀹屾垚 1203 璋冩嫧澶辫触 1204 璋冩嫧宸插鏍� 1205 宸查��杩�
     private String asId;
     private String[] asIds;
     private String storeId;
@@ -53,6 +55,8 @@
     private String staffId;
     private String staffName;
     private String staffTel;
+    private String applyType;
+    private String applyTypeName;
 
     public String getAsId() {
         return asId;
@@ -318,4 +322,21 @@
     public void setRssId(String rssId) {
         this.rssId = rssId;
     }
+
+
+    public String getApplyType() {
+        return applyType;
+    }
+
+    public void setApplyType(String applyType) {
+        this.applyType = applyType;
+    }
+
+    public String getApplyTypeName() {
+        return applyTypeName;
+    }
+
+    public void setApplyTypeName(String applyTypeName) {
+        this.applyTypeName = applyTypeName;
+    }
 }

--
Gitblit v1.8.0