Merge branch 'eskim' into develop

src/main/java/com/style24/admin/biz/service/TsaGoodsService.java

@@ -2691,7 +2691,7 @@ public class TsaGoodsService {
 			FreeGoods freeGoods = new FreeGoods();
 			freeGoods.setProductNo(wmsGoods.getProductNo());
 			freeGoods.setProductCode(wmsGoods.getProductCode());
-			freeGoods.setGoodsNm(wmsGoods.getModelNo());
+			freeGoods.setGoodsNm(wmsGoods.getProductName());
 			freeGoods.setBrandCd(wmsGoods.getBrandCd());
 			freeGoods.setUseYn("Y");
 			freeGoods.setUpdNo(TsaSession.getInfo().getUserNo());