From d8359ddb48dab5cc797a9d552e11fde571f4920c Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期二, 27 八月 2019 12:32:46 +0800
Subject: [PATCH] Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div

---
 fanli/src/main/java/com/yeshi/fanli/util/factory/goods/ShopInfoVOFactory.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/util/factory/goods/ShopInfoVOFactory.java b/fanli/src/main/java/com/yeshi/fanli/util/factory/goods/ShopInfoVOFactory.java
index b94bb28..05373b6 100644
--- a/fanli/src/main/java/com/yeshi/fanli/util/factory/goods/ShopInfoVOFactory.java
+++ b/fanli/src/main/java/com/yeshi/fanli/util/factory/goods/ShopInfoVOFactory.java
@@ -33,7 +33,7 @@
 		shopInfoVO.setScoreLogistics(shop.getScoreLogistics());
 		shopInfoVO.setScoreGoodsD(shop.getScoreGoodsD());
 		shopInfoVO.setScoreSellerD(shop.getScoreSellerD());
-		shopInfoVO.setScoreLogistics(shop.getScoreLogisticsD());
+		shopInfoVO.setScoreLogisticsD(shop.getScoreLogisticsD());
 		shopInfoVO.setGoodRatePercentage(shop.getGoodRatePercentage());
 		
 		Integer shopType = shop.getUserType();

--
Gitblit v1.8.0