From 5eab2b71f0749e9f61fc83d9d7e03553e9fa75ef Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 17 九月 2019 16:58:22 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/entity/brand/BrandInfo.java | 14 ++++++++++++--
1 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/entity/brand/BrandInfo.java b/fanli/src/main/java/com/yeshi/fanli/entity/brand/BrandInfo.java
index 4ab963a..0b31691 100644
--- a/fanli/src/main/java/com/yeshi/fanli/entity/brand/BrandInfo.java
+++ b/fanli/src/main/java/com/yeshi/fanli/entity/brand/BrandInfo.java
@@ -2,13 +2,11 @@
import java.io.Serializable;
import java.util.Date;
-import java.util.List;
import org.yeshi.utils.mybatis.Column;
import org.yeshi.utils.mybatis.Table;
import com.google.gson.annotations.Expose;
-import com.yeshi.fanli.vo.goods.GoodsDetailVO;
/**
* 鍝佺墝淇℃伅
@@ -35,6 +33,9 @@
@Expose
@Column(name = "bf_icon")
private String icon; // 鍝佺墝logo
+
+ @Column(name = "bf_goods_total")
+ private Integer goodsTotal; // 鎷ユ湁鍟嗗搧鏁伴噺
@Column(name = "bf_weight")
private Double weight; // 鏉冮噸锛氬�艰秺澶ц秺鍓�
@@ -120,4 +121,13 @@
public void setUpdateTime(Date updateTime) {
this.updateTime = updateTime;
}
+
+
+ public Integer getGoodsTotal() {
+ return goodsTotal;
+ }
+
+ public void setGoodsTotal(Integer goodsTotal) {
+ this.goodsTotal = goodsTotal;
+ }
}
\ No newline at end of file
--
Gitblit v1.8.0