From 4d7db6fd66f5b2c9cae9954e46314f9711ce1e8f Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 06 十一月 2019 18:51:40 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div

---
 fanli/src/main/java/com/yeshi/fanli/entity/brand/BrandInfo.java |   11 +++++++++++
 1 files changed, 11 insertions(+), 0 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 1798e95..cf48d09 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
@@ -30,6 +30,9 @@
 	@Column(name = "bf_name")
 	private String name; // 鍝佺墝鍚嶇О
 	
+	@Column(name = "bf_shop_key")
+	private String shopKey; // 搴楅摵鍖归厤璇�
+	
 	@Column(name = "bf_search_key")
 	private String searchKey; // 鎼滅储璇�
 	
@@ -141,4 +144,12 @@
 	public void setSearchKey(String searchKey) {
 		this.searchKey = searchKey;
 	}
+
+	public String getShopKey() {
+		return shopKey;
+	}
+
+	public void setShopKey(String shopKey) {
+		this.shopKey = shopKey;
+	}
 }
\ No newline at end of file

--
Gitblit v1.8.0