From d126b83f5d65f612ec93475b976fc5b5e2d6132a Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期五, 24 五月 2019 17:35:45 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 fanli/src/main/java/com/yeshi/fanli/entity/dynamic/GoodsPicture.java |   41 +++++++++++++++++++++++++++++++++++++++++
 1 files changed, 41 insertions(+), 0 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/entity/dynamic/GoodsPicture.java b/fanli/src/main/java/com/yeshi/fanli/entity/dynamic/GoodsPicture.java
index 964a53c..f006f3a 100644
--- a/fanli/src/main/java/com/yeshi/fanli/entity/dynamic/GoodsPicture.java
+++ b/fanli/src/main/java/com/yeshi/fanli/entity/dynamic/GoodsPicture.java
@@ -28,6 +28,14 @@
 	private String urlOriginal ;
 	// 鍒嗕韩鍥剧墖鏂囧瓧
 	private String titleOriginal ;
+	
+	// 鑷畾涔変簩缁寸爜鐨勪綅缃�
+	private Integer px;
+	private Integer py;
+	private Integer size;
+	
+	// 鍟嗗搧鐘舵�侊細 1鐪熷疄涓嬫灦 0
+	private int goodState;
 
 	public String getUrl() {
 		return url;
@@ -92,4 +100,37 @@
 	public void setTitleOriginal(String titleOriginal) {
 		this.titleOriginal = titleOriginal;
 	}
+
+	public Integer getPx() {
+		return px;
+	}
+
+	public void setPx(Integer px) {
+		this.px = px;
+	}
+
+	public Integer getPy() {
+		return py;
+	}
+
+	public void setPy(Integer py) {
+		this.py = py;
+	}
+
+	public Integer getSize() {
+		return size;
+	}
+
+	public void setSize(Integer size) {
+		this.size = size;
+	}
+
+	public int getGoodState() {
+		return goodState;
+	}
+
+	public void setGoodState(int goodState) {
+		this.goodState = goodState;
+	}
+	
 }

--
Gitblit v1.8.0