Merge branch 'develop' into bin2107

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

@@ -374,12 +374,9 @@
 	
 	// 투표자 조회
 	var fnSearchVote = function(data) {
-		
-		/* if (gagajf.isNull(data.pollQtitle)) {
-			$('#pollQtitle').text(' 투표자수');
-		} else {
-			$('#pollQtitle').text(' [' + data.pollQtitle + '] 투표자수');
-		} */
+		for (var i = 1; i <= 10 ; i++) {
+			gagaAgGrid.setColumnHeaderName(gridOptionsVote, 'dummy' + i, "ques"+ i);
+		}
 		var params = new Object();
 		params.pollQsq = data.pollQsq;
 		params.pollSq = data.pollSq;