From a0373d6b939d71878ccfcc067cbb4efa6d803830 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期六, 28 三月 2020 00:16:24 +0800
Subject: [PATCH] Merge branch 'back' of https://github.com/java110/MicroCommunity into back

---
 java110-bean/src/main/java/com/java110/dto/purchaseApply/PurchaseApplyDto.java |   22 +++++++++++++++++++++-
 1 files changed, 21 insertions(+), 1 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 030cb57..49f83eb 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
@@ -1,9 +1,11 @@
 package com.java110.dto.purchaseApply;
 
 import com.java110.dto.PageDto;
+import com.java110.vo.api.purchaseApply.PurchaseApplyDetailVo;
 
 import java.io.Serializable;
 import java.util.Date;
+import java.util.List;
 
 /**
  * @ClassName FloorDto
@@ -18,12 +20,13 @@
     private String resOrderType;
     private String description;
     private String applyOrderId;
+    private String bId;
     private String state;
     private String storeId;
     private String userName;
     private String userId;
     private String stateName;
-
+    private List<PurchaseApplyDetailVo> purchaseApplyDetailVo;
 
     private Date createTime;
 
@@ -34,6 +37,7 @@
     private String taskId;
     private String auditCode;
     private String auditMessage;
+
 
 
 
@@ -157,4 +161,20 @@
     public void setAuditMessage(String auditMessage) {
         this.auditMessage = auditMessage;
     }
+
+    public List<PurchaseApplyDetailVo> getPurchaseApplyDetailVo() {
+        return purchaseApplyDetailVo;
+    }
+
+    public void setPurchaseApplyDetailVo(List<PurchaseApplyDetailVo> purchaseApplyDetailVo) {
+        this.purchaseApplyDetailVo = purchaseApplyDetailVo;
+    }
+
+    public String getbId() {
+        return bId;
+    }
+
+    public void setbId(String bId) {
+        this.bId = bId;
+    }
 }

--
Gitblit v1.8.0