Merge branch 'develop' into bin2107

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

@@ -2841,7 +2841,7 @@
 		     , FN_GET_USER_NM(A.REG_NO) AS REG_NM
 		     , DATE_FORMAT(A.REG_DT,'%Y%m%d%H%i%S') AS REG_DT
 		     , A.UPD_NO
-		     , FN_GET_USER_NM(A.UPD_NO) AS REG_NM
+		     , FN_GET_USER_NM(A.UPD_NO) AS UPD_NM
 		     , DATE_FORMAT(A.UPD_DT,'%Y%m%d%H%i%S') AS UPD_DT
 		FROM TB_GOODS_VIDEO A
 		INNER JOIN TB_GOODS C ON A.GOODS_CD = C.GOODS_CD

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

@@ -184,13 +184,13 @@
 				return !gagajf.isNull(params.value) ? params.value.toDate("YYYYMMDDHHmmss").format("YYYY-MM-DD HH:mm:ss") : '';
 			}
 		},
-		{headerName: "등록자", field: "regNo", width: 150, cellClass: 'text-center'},
+		{headerName: "등록자", field: "regNm", width: 150, cellClass: 'text-center'},
 		{headerName: "수정일자", field: "updDt", width: 150, cellClass: 'text-center',
 			cellRenderer: function(params) {
 				return !gagajf.isNull(params.value) ? params.value.toDate("YYYYMMDDHHmmss").format("YYYY-MM-DD HH:mm:ss") : '';
 			}
 		},
-		{headerName: "수정자", field: "updNo", width: 150, cellClass: 'text-center'},
+		{headerName: "수정자", field: "updNm", width: 150, cellClass: 'text-center'},
 	];
 	
 	// Get GridOptions