Merge remote-tracking branch 'origin/xodud1202' into develop

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

@@ -80,6 +80,7 @@
 			 , FG.FREEGIFT_STAT
 			 , (SELECT CD_NM FROM TB_COMMON_CODE WHERE CD = FG.FREEGIFT_STAT) AS FREEGIFT_STAT_NM
 			 , FG.SELF_YN
+		     , FG.ALL_YN
 			 , DATE_FORMAT(FG.FREEGIFT_STDT, '%Y-%m-%d %H:%i:%S') AS FREEGIFT_STDT
 			 , DATE_FORMAT(FG.FREEGIFT_EDDT, '%Y-%m-%d %H:%i:%S') AS FREEGIFT_EDDT
 			 , (SELECT USER_NM FROM TB_USER WHERE USER_NO = FG.REG_NO) AS REG_NM

src/main/webapp/WEB-INF/views/goods/FreeGoodsSearchForm.html

@@ -73,9 +73,6 @@
 			, {headerName: "품번코드", field: "goodsNum", width: 150, cellClass: 'text-center'}
 			, {headerName: "사은품명", field: "goodsNm", width: 300, cellClass: 'text-center'}
 			, {headerName: "상태", field: "useYn", width: 50, cellClass: 'text-center'}
-			, {headerName: "잔여수량", field: "supplyStatNm", width: 150, cellClass: 'text-center'
-				,valueFormatter: function(params) { return '999'; }
-			}    <!-- 잔여 수량 해당 시점 기준 I/F 재고수량 표시 라고 되어있는데 맞는지 확인 필요함 -->
 		];
 
 		let gridOptionsFreeGoodsPopupList = gagaAgGrid.getGridOptions(columnFreeGoodsPopupDefList);

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

@@ -521,6 +521,12 @@
 			$("#freeGoodsPromotionForm #regInfo").text(freegift.regNm + "(" + freegift.regDt + ")");
 			$("#freeGoodsPromotionForm #updInfo").text(freegift.updNm + "(" + freegift.updDt + ")");
 
+			if(freegift.allYn == "Y") {
+				$("#freeGoodsPromotionForm #allY").prop("checked", true);
+			} else {
+				$("#freeGoodsPromotionForm #allN").prop("checked", true);
+			}
+
 			// 자사 적용일 경우
 			if(freegift.selfYn == "Y") {
 				$("#freeGoodsPromotionForm input[name=selfYn]").prop("checked", true);