From 2b919980a8c70554a64cb3d03cc95679af4d817f Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: 星期一, 03 七月 2023 00:22:16 +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 |   41 ++++++++++++++++++++++++++++++++++++++++-
 1 files changed, 40 insertions(+), 1 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 81562b3..5c83655 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,6 +1,7 @@
 package com.java110.vo.api.resourceStore;
 
-import com.java110.dto.resourceSupplier.ResourceSupplierDto;
+import com.java110.dto.resource.ResourceStoreTimesDto;
+import com.java110.dto.resource.ResourceSupplierDto;
 
 import java.io.Serializable;
 import java.util.Date;
@@ -54,7 +55,13 @@
     private String miniStock;
     private String parentRstId;
     private String parentRstName;
+    //鏄惁鏄浐瀹氱墿鍝�
+    private String isFixed;
+    private String isFixedName;
 
+    private String totalPrice;
+
+    private List<ResourceStoreTimesDto> times;
     public String getResId() {
         return resId;
     }
@@ -310,4 +317,36 @@
     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;
+    }
+
+    public String getTotalPrice() {
+        return totalPrice;
+    }
+
+    public void setTotalPrice(String totalPrice) {
+        this.totalPrice = totalPrice;
+    }
 }

--
Gitblit v1.8.0