Merge branch 'eskim' into develop

src/main/java/com/style24/persistence/mybatis/shop/TsbGoods.xml

@@ -1172,7 +1172,7 @@
 		   , A.SCORE_THICK3        = IFNULL(GS.SCORE_THICK3,0)
 		   , A.SCORE_WEIGHT1       = IFNULL(GS.SCORE_WEIGHT1,0)
 		   , A.SCORE_WEIGHT2       = IFNULL(GS.SCORE_WEIGHT2,0)
-		   , A.SCORE_WEIGHT3       = IFNULL(GS.SCORE_WEIGHT2,0)
+		   , A.SCORE_WEIGHT3       = IFNULL(GS.SCORE_WEIGHT3,0)
 		   , A.SCORE_BALL1         = IFNULL(GS.SCORE_BALL1,0)
 		   , A.SCORE_BALL2         = IFNULL(GS.SCORE_BALL2,0)
 		   , A.SCORE_BALL3         = IFNULL(GS.SCORE_BALL3,0)