From 3b0ddfa0b1c3490fbbf421a84e0431a60fb58387 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期四, 01 四月 2021 12:25:35 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/xinghong-dev'

---
 java110-bean/src/main/java/com/java110/dto/resourceStore/ResourceStoreDto.java |   92 +++++++++++++++++++++++++++++++++++++++++++++-
 1 files changed, 90 insertions(+), 2 deletions(-)

diff --git a/java110-bean/src/main/java/com/java110/dto/resourceStore/ResourceStoreDto.java b/java110-bean/src/main/java/com/java110/dto/resourceStore/ResourceStoreDto.java
index 3ac3604..cece0dc 100644
--- a/java110-bean/src/main/java/com/java110/dto/resourceStore/ResourceStoreDto.java
+++ b/java110-bean/src/main/java/com/java110/dto/resourceStore/ResourceStoreDto.java
@@ -4,6 +4,7 @@
 
 import java.io.Serializable;
 import java.util.Date;
+import java.util.List;
 
 /**
  * @ClassName FloorDto
@@ -24,8 +25,23 @@
     private String resId;
     //10000 閲囪喘 20000鍑哄簱
     private String resOrderType;
-
-
+    //鐗╁搧绫诲瀷
+    private String goodsType;
+    //鐗╁搧绫诲瀷鍚嶇О
+    private String goodsTypeName;
+    //鍗曚綅
+    private String unitCode;
+    //澶囨敞
+    private String remark;
+    //瀵瑰鍞环鏈�浣庝环鏍�
+    private String outLowPrice;
+    //瀵瑰鏀堕泦鏈�楂樹环鏍�
+    private String outHighPrice;
+    //瀵瑰鍞环
+    private String outPrice;
+    //鎵嬫満绔槸鍚︽樉绀�(N鍚� Y鏄�)
+    private String showMobile;
+    private List<String> fileUrls;
     private Date createTime;
 
     private String statusCd = "0";
@@ -111,4 +127,76 @@
     public void setResOrderType(String resOrderType) {
         this.resOrderType = resOrderType;
     }
+
+    public String getGoodsType() {
+        return goodsType;
+    }
+
+    public void setGoodsType(String goodsType) {
+        this.goodsType = goodsType;
+    }
+
+    public String getUnitCode() {
+        return unitCode;
+    }
+
+    public void setUnitCode(String unitCode) {
+        this.unitCode = unitCode;
+    }
+
+    public String getRemark() {
+        return remark;
+    }
+
+    public void setRemark(String remark) {
+        this.remark = remark;
+    }
+
+    public String getOutLowPrice() {
+        return outLowPrice;
+    }
+
+    public void setOutLowPrice(String outLowPrice) {
+        this.outLowPrice = outLowPrice;
+    }
+
+    public String getOutHighPrice() {
+        return outHighPrice;
+    }
+
+    public void setOutHighPrice(String outHighPrice) {
+        this.outHighPrice = outHighPrice;
+    }
+
+    public String getOutPrice() {
+        return outPrice;
+    }
+
+    public void setOutPrice(String outPrice) {
+        this.outPrice = outPrice;
+    }
+
+    public String getShowMobile() {
+        return showMobile;
+    }
+
+    public void setShowMobile(String showMobile) {
+        this.showMobile = showMobile;
+    }
+
+    public String getGoodsTypeName() {
+        return goodsTypeName;
+    }
+
+    public void setGoodsTypeName(String goodsTypeName) {
+        this.goodsTypeName = goodsTypeName;
+    }
+
+    public List<String> getFileUrls() {
+        return fileUrls;
+    }
+
+    public void setFileUrls(List<String> fileUrls) {
+        this.fileUrls = fileUrls;
+    }
 }

--
Gitblit v1.8.0