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/dto/resourceStoreTimes/ResourceStoreTimesDto.java |   30 +++++++++++++++++++++++++++++-
 1 files changed, 29 insertions(+), 1 deletions(-)

diff --git a/java110-bean/src/main/java/com/java110/dto/resourceStoreTimes/ResourceStoreTimesDto.java b/java110-bean/src/main/java/com/java110/dto/resourceStoreTimes/ResourceStoreTimesDto.java
index 4158b81..d0fe69a 100644
--- a/java110-bean/src/main/java/com/java110/dto/resourceStoreTimes/ResourceStoreTimesDto.java
+++ b/java110-bean/src/main/java/com/java110/dto/resourceStoreTimes/ResourceStoreTimesDto.java
@@ -1,6 +1,7 @@
 package com.java110.dto.resourceStoreTimes;
 
 import com.java110.dto.PageDto;
+import com.java110.dto.resourceStore.ResourceStoreDto;
 
 import java.io.Serializable;
 import java.util.Date;
@@ -13,16 +14,19 @@
  * @Version 1.0
  * add by wuxw 2019/4/24
  **/
-public class ResourceStoreTimesDto extends PageDto implements Serializable {
+public class ResourceStoreTimesDto extends ResourceStoreDto implements Serializable {
 
     private String price;
+    private String totalPrice;
     private String applyOrderId;
     private String storeId;
     private String stock;
 
     private String hasStock;
     private String resCode;
+    private String[] resCodes;
     private String timesId;
+    private String shId;
 
 
     private Date createTime;
@@ -102,4 +106,28 @@
     public void setHasStock(String hasStock) {
         this.hasStock = hasStock;
     }
+
+    public String getTotalPrice() {
+        return totalPrice;
+    }
+
+    public void setTotalPrice(String totalPrice) {
+        this.totalPrice = totalPrice;
+    }
+
+    public String[] getResCodes() {
+        return resCodes;
+    }
+
+    public void setResCodes(String[] resCodes) {
+        this.resCodes = resCodes;
+    }
+
+    public String getShId() {
+        return shId;
+    }
+
+    public void setShId(String shId) {
+        this.shId = shId;
+    }
 }

--
Gitblit v1.8.0