Merge branch 'develop' into bin2107

src/main/java/com/style24/admin/biz/web/TsaGoodsController.java

@@ -7,7 +7,6 @@ import java.util.Collection;
 
 import javax.servlet.http.HttpServletRequest;
 
-import com.style24.persistence.TscPageRequest;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.core.env.Environment;
 import org.springframework.core.io.InputStreamResource;
@@ -32,6 +31,7 @@ import com.style24.admin.biz.service.TsaSystemService;
 import com.style24.admin.support.controller.TsaBaseController;
 import com.style24.admin.support.security.session.TsaSession;
 import com.style24.core.support.message.TscMessageByLocale;
+import com.style24.persistence.TscPageRequest;
 import com.style24.persistence.domain.AdKeyword;
 import com.style24.persistence.domain.AdKeywordGoods;
 import com.style24.persistence.domain.Color;
@@ -617,7 +617,6 @@ public class TsaGoodsController extends TsaBaseController {
 					//고시정보
 					GoodsNotiInfo goodsNotiInfo = new GoodsNotiInfo();
 					goodsNotiInfo.setGoodsCd(tmpGoods.getGoodsCd());
-					goodsNotiInfo.setSupplyCompCd(tmpGoods.getSupplyCompCd());
 					goodsNotiInfo.setNiClsfCd(tmpGoods.getNiClsfCd());
 					Collection<GoodsNotiInfo> goodsNotiInfoList = goodsService.getGoodsNotiInfoList(goodsNotiInfo);
 					if (goodsNotiInfoList == null || goodsNotiInfoList.isEmpty()) {
@@ -845,7 +844,6 @@ public class TsaGoodsController extends TsaBaseController {
 		GoodsNotiInfo goodsInfo = new GoodsNotiInfo();
 		goodsInfo.setGoodsCd(goods.getGoodsCd());
 		goodsInfo.setNiClsfCd(goods.getNiClsfCd());
-		goodsInfo.setSupplyCompCd(goods.getSupplyCompCd());
 
 		return goodsService.getGoodsNotiInfoList(goodsInfo);
 	}

src/main/java/com/style24/persistence/domain/GoodsNotiInfo.java

@@ -23,6 +23,6 @@ public class GoodsNotiInfo extends TscBaseDomain {
 	private String reqYn;
 
 	private String niItemNm;
-	private String supplyCompCd;
+	private String supplyVendorCd;
 
 }

src/main/webapp/WEB-INF/views/marketing/CouponRetrievePopupForm.html

@@ -171,10 +171,10 @@
 	gridOptionsCouponList.rowSelection = 'single';
 	gridOptionsCouponList.rowMultiSelectWithClick = true; // 클릭으로 선택 가능
 	
-	// Row double click
-	gridOptionsCouponList.onRowDoubleClicked = function(event) {
-		$('#btnConfirmCoupon').trigger('click');
-	}
+// 	// Row double click
+// 	gridOptionsCouponList.onRowDoubleClicked = function(event) {
+// 		$('#btnConfirmCoupon').trigger('click');
+// 	}
 
 	// 조회
 	$('#btnSearchCouponRetrieve').on('click', function() {