From 0b04f664887c73e90bf684a4e69c0fdbfe26349d Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期三, 29 三月 2023 13:35:20 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity

---
 java110-bean/src/main/java/com/java110/vo/api/resourceStore/ApiResourceStoreDataVo.java |   47 +++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 47 insertions(+), 0 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 579a384..a216f74 100755
--- 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,6 @@
 package com.java110.vo.api.resourceStore;
 
+import com.java110.dto.resourceStoreTimes.ResourceStoreTimesDto;
 import com.java110.dto.resourceSupplier.ResourceSupplierDto;
 
 import java.io.Serializable;
@@ -52,7 +53,13 @@
     private String miniUnitStock;
     //鏈�灏忚閲忔�绘暟
     private String miniStock;
+    private String parentRstId;
+    private String parentRstName;
+    //鏄惁鏄浐瀹氱墿鍝�
+    private String isFixed;
+    private String isFixedName;
 
+    private List<ResourceStoreTimesDto> times;
     public String getResId() {
         return resId;
     }
@@ -292,4 +299,44 @@
     public void setShType(String shType) {
         this.shType = shType;
     }
+
+    public String getParentRstId() {
+        return parentRstId;
+    }
+
+    public void setParentRstId(String parentRstId) {
+        this.parentRstId = parentRstId;
+    }
+
+    public String getParentRstName() {
+        return parentRstName;
+    }
+
+    public void setParentRstName(String parentRstName) {
+        this.parentRstName = parentRstName;
+    }
+
+    public String getIsFixed() {
+        return isFixed;
+    }
+
+    public void setIsFixed(String isFixed) {
+        this.isFixed = isFixed;
+    }
+
+    public String getIsFixedName() {
+        return isFixedName;
+    }
+
+    public void setIsFixedName(String isFixedName) {
+        this.isFixedName = isFixedName;
+    }
+
+    public List<ResourceStoreTimesDto> getTimes() {
+        return times;
+    }
+
+    public void setTimes(List<ResourceStoreTimesDto> times) {
+        this.times = times;
+    }
 }

--
Gitblit v1.8.0