From b8e7bb1791ff41be5ee8150cc46af082d7444a65 Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: 星期三, 31 五月 2023 01:02:29 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity

---
 java110-bean/src/main/java/com/java110/dto/resourceStoreTimes/ResourceStoreTimesDto.java |   21 ++++++++++++++++++++-
 1 files changed, 20 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 0fa067b..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,7 +14,7 @@
  * @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;
@@ -23,7 +24,9 @@
 
     private String hasStock;
     private String resCode;
+    private String[] resCodes;
     private String timesId;
+    private String shId;
 
 
     private Date createTime;
@@ -111,4 +114,20 @@
     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