From 1af4e76f8440b1efbbce3689fdcc16f4a4f2c6c3 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期五, 18 六月 2021 00:01:42 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity
---
java110-bean/src/main/java/com/java110/dto/resourceStore/ResourceStoreDto.java | 137 +++++++++++++++++++++++++++++++++++++++------
1 files changed, 117 insertions(+), 20 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
old mode 100644
new mode 100755
index cece0dc..9d0e71d
--- a/java110-bean/src/main/java/com/java110/dto/resourceStore/ResourceStoreDto.java
+++ b/java110-bean/src/main/java/com/java110/dto/resourceStore/ResourceStoreDto.java
@@ -16,7 +16,10 @@
**/
public class ResourceStoreDto extends PageDto implements Serializable {
+ //鐗╁搧鍚嶇О(鐢ㄦ潵鍋氭ā绯婃煡璇�)
private String resName;
+ //鐗╁搧鍚嶇О(鐢ㄦ潵鍋氱簿纭煡璇�)
+ private String name;
private String price;
private String resCode;
private String description;
@@ -25,10 +28,6 @@
private String resId;
//10000 閲囪喘 20000鍑哄簱
private String resOrderType;
- //鐗╁搧绫诲瀷
- private String goodsType;
- //鐗╁搧绫诲瀷鍚嶇О
- private String goodsTypeName;
//鍗曚綅
private String unitCode;
//澶囨敞
@@ -41,11 +40,29 @@
private String outPrice;
//鎵嬫満绔槸鍚︽樉绀�(N鍚� Y鏄�)
private String showMobile;
+
+ private String shId;
+ private String warningStock;
+ private String shType;
+ private String shObjId;
+ private String averagePrice;
private List<String> fileUrls;
private Date createTime;
+ private String rstId;
+ private String rstName;
private String statusCd = "0";
+ private String shName;
+
+ //瑙勬牸id
+ private String rssId;
+
+ //瑙勬牸鍚嶇О
+ private String rssName;
+
+ //鐗╁搧鎬讳环
+ private String totalPrice;
public String getResName() {
return resName;
@@ -128,14 +145,6 @@
this.resOrderType = resOrderType;
}
- public String getGoodsType() {
- return goodsType;
- }
-
- public void setGoodsType(String goodsType) {
- this.goodsType = goodsType;
- }
-
public String getUnitCode() {
return unitCode;
}
@@ -184,14 +193,6 @@
this.showMobile = showMobile;
}
- public String getGoodsTypeName() {
- return goodsTypeName;
- }
-
- public void setGoodsTypeName(String goodsTypeName) {
- this.goodsTypeName = goodsTypeName;
- }
-
public List<String> getFileUrls() {
return fileUrls;
}
@@ -199,4 +200,100 @@
public void setFileUrls(List<String> fileUrls) {
this.fileUrls = fileUrls;
}
+
+ public String getShId() {
+ return shId;
+ }
+
+ public void setShId(String shId) {
+ this.shId = shId;
+ }
+
+ public String getShName() {
+ return shName;
+ }
+
+ public void setShName(String shName) {
+ this.shName = shName;
+ }
+
+ public String getShType() {
+ return shType;
+ }
+
+ public void setShType(String shType) {
+ this.shType = shType;
+ }
+
+ public String getShObjId() {
+ return shObjId;
+ }
+
+ public void setShObjId(String shObjId) {
+ this.shObjId = shObjId;
+ }
+
+ public String getWarningStock() {
+ return warningStock;
+ }
+
+ public void setWarningStock(String warningStock) {
+ this.warningStock = warningStock;
+ }
+
+ public String getAveragePrice() {
+ return averagePrice;
+ }
+
+ public void setAveragePrice(String averagePrice) {
+ this.averagePrice = averagePrice;
+ }
+
+ public String getName() {
+ return name;
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
+
+ public String getRstId() {
+ return rstId;
+ }
+
+ public void setRstId(String rstId) {
+ this.rstId = rstId;
+ }
+
+ public String getRstName() {
+ return rstName;
+ }
+
+ public void setRstName(String rstName) {
+ this.rstName = rstName;
+ }
+
+ public String getRssId() {
+ return rssId;
+ }
+
+ public void setRssId(String rssId) {
+ this.rssId = rssId;
+ }
+
+ public String getRssName() {
+ return rssName;
+ }
+
+ public void setRssName(String rssName) {
+ this.rssName = rssName;
+ }
+
+ public String getTotalPrice() {
+ return totalPrice;
+ }
+
+ public void setTotalPrice(String totalPrice) {
+ this.totalPrice = totalPrice;
+ }
}
--
Gitblit v1.8.0