From bef0ef19d792a16a31a59ec7beafc7b0885529fa Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期三, 06 十一月 2019 15:36:31 +0800
Subject: [PATCH] Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div

---
 fanli/src/main/java/com/yeshi/fanli/entity/shop/BanLiShopGoods.java |   11 ++++++++++-
 1 files changed, 10 insertions(+), 1 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/entity/shop/BanLiShopGoods.java b/fanli/src/main/java/com/yeshi/fanli/entity/shop/BanLiShopGoods.java
index e84a94a..5d4c618 100644
--- a/fanli/src/main/java/com/yeshi/fanli/entity/shop/BanLiShopGoods.java
+++ b/fanli/src/main/java/com/yeshi/fanli/entity/shop/BanLiShopGoods.java
@@ -39,7 +39,8 @@
 	private Date updateTime;
 	@Column(name = "sg_weight")
 	private Integer weight;
-
+	@Column(name = "so_square_picture")
+	private String squarePicture;// 鏂瑰舰鍥剧墖
 	// 濂楅
 	private List<BanLiShopGoodsSets> setsList;
 	// 鍥剧墖
@@ -155,4 +156,12 @@
 	public void setWeight(Integer weight) {
 		this.weight = weight;
 	}
+
+	public String getSquarePicture() {
+		return squarePicture;
+	}
+
+	public void setSquarePicture(String squarePicture) {
+		this.squarePicture = squarePicture;
+	}
 }

--
Gitblit v1.8.0