Merge branch 'develop' of http://112.172.147.34:4936/style24/style24.admin.git into develop

src/main/webapp/WEB-INF/views/display/CategoryGoodsForm.html

@@ -211,6 +211,7 @@
 		{headerName: "공급업체상품코드", field: "supplyGoodsCd", width: 120, cellClass: 'text-center'},
 		{headerName: "스타일구분", field: "styleYear", width: 80, cellClass: 'text-center'},
 		{headerName: "정상/이월", field: "formalGb", width: 80, cellClass: 'text-center'},
+		{headerName: "등록자ID", field: "regNo", width: 80, cellClass: 'text-center'},
 		{headerName: "등록자", field: "regNm", width: 80, cellClass: 'text-center'},
 		{headerName: "등록일시", field: "regDt", width: 150, cellClass: 'text-center'}
 	];

src/main/webapp/WEB-INF/views/display/MainContentsPopupForm.html

@@ -1751,18 +1751,18 @@
 		html += '<th>모바일용 이미지';
 		html += '</th>';
 		html += '<td><div class="uFile w300 mobImgFile">';
-		html += '<input id="filePop_'+imgMobIndex+'" name="file" type="file" class="uFileInput w300" onchange="fnPopFileUpload(this, '+imgMobIndex+')"/>';
-		html += '<label for="filePop_'+imgMobIndex+'" class="uFileLabel">파일선택</label>';
+		html += '<input id="filePop_100'+imgMobIndex+'" name="file" type="file" class="uFileInput w300" onchange="fnPopFileUpload(this, 100'+imgMobIndex+')"/>';
+		html += '<label for="filePop_100'+imgMobIndex+'" class="uFileLabel">파일선택</label>';
 		html += '<input type="hidden" name="imgPath" value="'+imgPath+'"/>';
 		html += '<input type="hidden" name="newImgFile" value="" />';
 		html += '</div>';
-		html += '<div id="imgViewPop_'+imgMobIndex+'" class=';
+		html += '<div id="imgViewPop_100'+imgMobIndex+'" class=';
 		if(src!=''){
 			html += '"on">';
 		}else{
 			html += '"off">';
 		}
-		html += '<img id="bannerPreViewUrlPop_'+imgMobIndex+'" src="'+src+'" style="height:100px; max-width:500px;"  onclick="cfnOpenImagePreViewPopup(\'bannerPreimgViewPop\',$(this).attr(\'src\'));"/>';
+		html += '<img id="bannerPreViewUrlPop_100'+imgMobIndex+'" src="'+src+'" style="height:100px; max-width:500px;"  onclick="cfnOpenImagePreViewPopup(\'bannerPreimgViewPop\',$(this).attr(\'src\'));"/>';
 		html += '</div></td>';
 		if(contentsLoc!='SMM001' && contentsLoc!='SOM001' && contentsLoc!='SCM001' && contentsLoc!='SBM004'){
 			html += '<td class="aL"><button type="button" class="btn icn" onclick="fnDeleteTrRow(this);"><i class="fa fa-times" aria-hidden="true"></i></button></td>';