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 |  104 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 104 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 c2c8930..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;
@@ -14,11 +15,13 @@
     private String rstName;
     private String resCode;
     private String price;
+    private String shType;
     //搴撳瓨鏁�
     private String stock;
     private String description;
     //鍗曚綅
     private String unitCode;
+    private String unitCodeName;
     //澶囨敞
     private String remark;
     //瀵瑰鍞环鏈�浣庝环鏍�
@@ -43,7 +46,20 @@
     private String highTotalPrice;
     //鐗╁搧鎬讳环(灏忚)
     private String subTotalPrice;
+    //鏈�灏忚閲忓崟浣�
+    private String miniUnitCode;
+    private String miniUnitCodeName;
+    //鏈�灏忚閲忓崟浣嶆暟閲�
+    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;
     }
@@ -235,4 +251,92 @@
     public void setSubTotalPrice(String subTotalPrice) {
         this.subTotalPrice = subTotalPrice;
     }
+
+    public String getUnitCodeName() {
+        return unitCodeName;
+    }
+
+    public void setUnitCodeName(String unitCodeName) {
+        this.unitCodeName = unitCodeName;
+    }
+
+    public String getMiniUnitCode() {
+        return miniUnitCode;
+    }
+
+    public void setMiniUnitCode(String miniUnitCode) {
+        this.miniUnitCode = miniUnitCode;
+    }
+
+    public String getMiniUnitCodeName() {
+        return miniUnitCodeName;
+    }
+
+    public void setMiniUnitCodeName(String miniUnitCodeName) {
+        this.miniUnitCodeName = miniUnitCodeName;
+    }
+
+    public String getMiniUnitStock() {
+        return miniUnitStock;
+    }
+
+    public void setMiniUnitStock(String miniUnitStock) {
+        this.miniUnitStock = miniUnitStock;
+    }
+
+    public String getMiniStock() {
+        return miniStock;
+    }
+
+    public void setMiniStock(String miniStock) {
+        this.miniStock = miniStock;
+    }
+
+    public String getShType() {
+        return shType;
+    }
+
+    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