From 35c25585cf6fea9e29574a75a03c57381cbe19e1 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期一, 05 八月 2019 16:35:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div

---
 fanli/src/main/java/com/yeshi/fanli/entity/dynamic/GoodsPicture.java |    2 +-
 1 files changed, 1 insertions(+), 1 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 1c76958..80e7c91 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
@@ -38,7 +38,7 @@
 	private Integer py;
 	private Integer size;
 	
-	// 鍟嗗搧鐘舵�侊細 1鐪熷疄涓嬫灦 0
+	// 鍟嗗搧鐘舵�侊細 1涓嬫灦  0
 	private int goodState;
 
 	public String getUrl() {

--
Gitblit v1.8.0