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

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

@@ -1042,7 +1042,7 @@
 								, G.DC_RATE
 								, G.GOODS_STAT
 								, G.BRAND_CD
-								, (SELECT BRAND_GRP_NM FROM TB_BRAND WHERE 1=1 AND G.BRAND_CD = BRAND_CD) AS BRAND_GRP_NM
+								, (SELECT CASE WHEN DISP_NM_LANG = 'EN' THEN BRAND_ENM ELSE BRAND_KNM END AS BRAND_NM FROM TB_BRAND WHERE 1=1 AND G.BRAND_CD = BRAND_CD) AS BRAND_GRP_NM
 								, A.REG_NO
 								, FN_GET_USER_NM(A.REG_NO) AS REG_NM
 								, A.REG_DT

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

@@ -257,14 +257,23 @@
 		cfnOpenGoodsDispOrdChangePopup('', params);
 	});
 
+	var checkValidation = function (){
+		if(gagajf.isNull($("#goodsSearch").find("input[name=goodsCd]").val())){
+			mcxDialog.alert("상품코드를 입력하세요.");
+			return false;
+		}
+		return true;
+	}
+
 	/**
 	 * 상품조회 버튼 클릭시
 	 */
 	$("#btnSearch").on('click', function(){
-		if(gagajf.isNull($("#goodsSearch").find("input[name=goodsCd]").val())){
-            mcxDialog.alert("상품코드를 입력하세요.");
-            return false;
-        }
+		// 기간체크
+		if(!checkValidation()){
+			return false;
+		}
+
 	    $("#searchForm input[name=searchGb]").val("BASIC");
 		gagaPaging.load(1);
 	});

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

@@ -379,7 +379,15 @@
 		var columCategoryDefs = [
 			{width: 40, minWidth: 40, cellClass: 'text-center', headerCheckboxSelection: true, checkboxSelection: true, filter: false},
 			{headerName: "자동전시카테고리코드", field: "cateCd", width: 150, cellClass: 'text-center'},
-			{headerName: "자동전시카테고리", field: "fullCateNm", width: 400, cellClass: 'text-left'},
+			{headerName: "자동전시카테고리", field: "fullCateNm", width: 400, cellClass: 'text-left',
+				cellRenderer: function (params) {
+					if (gagajf.isNull( params.value)){
+						return  params.value;
+					}else{
+						return  params.value.replaceAll(">", ">");
+					}
+				}
+			},
 			{headerName: "카테고리1", field: "cateCd1", width: 150, cellClass: 'text-left', hide: true},
 			{headerName: "카테고리2", field: "cateCd2", width: 150, cellClass: 'text-left', hide: true},
 			{headerName: "카테고리3", field: "cateCd3", width: 150, cellClass: 'text-left', hide: true},