From 8e3827a655cb13c67210bae939448ddd42ec8084 Mon Sep 17 00:00:00 2001
From: xiaogang <905166056@qq.com>
Date: 星期四, 29 四月 2021 16:27:30 +0800
Subject: [PATCH] 优化采购管理 1、新增个人物品转增2、物品使用记录3、新增商品供应商4、部分优化

---
 java110-bean/src/main/java/com/java110/vo/api/resourceStore/ApiResourceStoreDataVo.java |   39 ++++++++++++++++++++++++++++++---------
 1 files changed, 30 insertions(+), 9 deletions(-)

diff --git a/java110-bean/src/main/java/com/java110/vo/api/resourceStore/ApiResourceStoreDataVo.java b/java110-bean/src/main/java/com/java110/vo/api/resourceStore/ApiResourceStoreDataVo.java
index 60b6a93..d220dc8 100644
--- a/java110-bean/src/main/java/com/java110/vo/api/resourceStore/ApiResourceStoreDataVo.java
+++ b/java110-bean/src/main/java/com/java110/vo/api/resourceStore/ApiResourceStoreDataVo.java
@@ -1,5 +1,7 @@
 package com.java110.vo.api.resourceStore;
 
+import com.java110.dto.resourceSupplier.ResourceSupplierDto;
+
 import java.io.Serializable;
 import java.util.Date;
 import java.util.List;
@@ -24,14 +26,16 @@
     private String outLowPrice;
     //瀵瑰鏀堕泦鏈�楂樹环鏍�
     private String outHighPrice;
-    //瀵瑰鍞环
-    private String outPrice;
     //鎵嬫満绔槸鍚︽樉绀�(N鍚� Y鏄�)
     private String showMobile;
     private Date createTime;
     private String shName;
     private String shId;
+    private String warningStock;
     private List<String> fileUrls;
+    private List<ResourceSupplierDto> resourceSupplierDtos;
+    //鍧囦环
+    private String averagePrice;
 
     public String getResId() {
         return resId;
@@ -121,13 +125,6 @@
         this.outHighPrice = outHighPrice;
     }
 
-    public String getOutPrice() {
-        return outPrice;
-    }
-
-    public void setOutPrice(String outPrice) {
-        this.outPrice = outPrice;
-    }
 
     public String getShowMobile() {
         return showMobile;
@@ -176,4 +173,28 @@
     public void setShId(String shId) {
         this.shId = shId;
     }
+
+    public List<ResourceSupplierDto> getResourceSupplierDtos() {
+        return resourceSupplierDtos;
+    }
+
+    public void setResourceSupplierDtos(List<ResourceSupplierDto> resourceSupplierDtos) {
+        this.resourceSupplierDtos = resourceSupplierDtos;
+    }
+
+    public String getWarningStock() {
+        return warningStock;
+    }
+
+    public void setWarningStock(String warningStock) {
+        this.warningStock = warningStock;
+    }
+
+    public String getAveragePrice() {
+        return averagePrice;
+    }
+
+    public void setAveragePrice(String averagePrice) {
+        this.averagePrice = averagePrice;
+    }
 }

--
Gitblit v1.8.0