From 05683f2b2bdbdbe21cf17ad523c21ab338bd1c54 Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期二, 19 七月 2022 21:49:55 +0800
Subject: [PATCH] 优化添加设备 功能

---
 java110-bean/src/main/java/com/java110/vo/api/resourceStore/ApiResourceStoreDataVo.java |  174 +++++++++++++++++++++++++++++++++++++++++++++++++++-------
 1 files changed, 153 insertions(+), 21 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
old mode 100644
new mode 100755
index d220dc8..b522769
--- 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
@@ -10,16 +10,17 @@
 
     private String resId;
     private String resName;
+    private String rstId;
+    private String rstName;
     private String resCode;
     private String price;
+    private String shType;
+    //搴撳瓨鏁�
     private String stock;
     private String description;
-    //鐗╁搧绫诲瀷
-    private String goodsType;
-    //鐗╁搧绫诲瀷鍚嶇О
-    private String goodsTypeName;
     //鍗曚綅
     private String unitCode;
+    private String unitCodeName;
     //澶囨敞
     private String remark;
     //瀵瑰鍞环鏈�浣庝环鏍�
@@ -36,6 +37,26 @@
     private List<ResourceSupplierDto> resourceSupplierDtos;
     //鍧囦环
     private String averagePrice;
+    //瑙勬牸id
+    private String rssId;
+    //瑙勬牸鍚嶇О
+    private String rssName;
+    //鐗╁搧鎬讳环(澶ц)
+    private String highTotalPrice;
+    //鐗╁搧鎬讳环(灏忚)
+    private String subTotalPrice;
+    //鏈�灏忚閲忓崟浣�
+    private String miniUnitCode;
+    private String miniUnitCodeName;
+    //鏈�灏忚閲忓崟浣嶆暟閲�
+    private String miniUnitStock;
+    //鏈�灏忚閲忔�绘暟
+    private String miniStock;
+    private String parentRstId;
+    private String parentRstName;
+    //鏄惁鏄浐瀹氱墿鍝�
+    private String isFixed;
+    private String isFixedName;
 
     public String getResId() {
         return resId;
@@ -85,14 +106,6 @@
         this.description = description;
     }
 
-    public String getGoodsType() {
-        return goodsType;
-    }
-
-    public void setGoodsType(String goodsType) {
-        this.goodsType = goodsType;
-    }
-
     public String getUnitCode() {
         return unitCode;
     }
@@ -125,7 +138,6 @@
         this.outHighPrice = outHighPrice;
     }
 
-
     public String getShowMobile() {
         return showMobile;
     }
@@ -140,14 +152,6 @@
 
     public void setCreateTime(Date createTime) {
         this.createTime = createTime;
-    }
-
-    public String getGoodsTypeName() {
-        return goodsTypeName;
-    }
-
-    public void setGoodsTypeName(String goodsTypeName) {
-        this.goodsTypeName = goodsTypeName;
     }
 
     public List<String> getFileUrls() {
@@ -197,4 +201,132 @@
     public void setAveragePrice(String averagePrice) {
         this.averagePrice = averagePrice;
     }
+
+    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 getHighTotalPrice() {
+        return highTotalPrice;
+    }
+
+    public void setHighTotalPrice(String highTotalPrice) {
+        this.highTotalPrice = highTotalPrice;
+    }
+
+    public String getSubTotalPrice() {
+        return subTotalPrice;
+    }
+
+    public void setSubTotalPrice(String subTotalPrice) {
+        this.subTotalPrice = subTotalPrice;
+    }
+
+    public String getUnitCodeName() {
+        return unitCodeName;
+    }
+
+    public void setUnitCodeName(String unitCodeName) {
+        this.unitCodeName = unitCodeName;
+    }
+
+    public String getMiniUnitCode() {
+        return miniUnitCode;
+    }
+
+    public void setMiniUnitCode(String miniUnitCode) {
+        this.miniUnitCode = miniUnitCode;
+    }
+
+    public String getMiniUnitCodeName() {
+        return miniUnitCodeName;
+    }
+
+    public void setMiniUnitCodeName(String miniUnitCodeName) {
+        this.miniUnitCodeName = miniUnitCodeName;
+    }
+
+    public String getMiniUnitStock() {
+        return miniUnitStock;
+    }
+
+    public void setMiniUnitStock(String miniUnitStock) {
+        this.miniUnitStock = miniUnitStock;
+    }
+
+    public String getMiniStock() {
+        return miniStock;
+    }
+
+    public void setMiniStock(String miniStock) {
+        this.miniStock = miniStock;
+    }
+
+    public String getShType() {
+        return shType;
+    }
+
+    public void setShType(String shType) {
+        this.shType = shType;
+    }
+
+    public String getParentRstId() {
+        return parentRstId;
+    }
+
+    public void setParentRstId(String parentRstId) {
+        this.parentRstId = parentRstId;
+    }
+
+    public String getParentRstName() {
+        return parentRstName;
+    }
+
+    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;
+    }
 }

--
Gitblit v1.8.0