From 364495f7e4cf0c996e3377890568063c743c7483 Mon Sep 17 00:00:00 2001 From: ijunho Date: Mon, 12 May 2025 15:39:27 +0900 Subject: [PATCH] Merge branch 'master_tolag3' MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 알림톡 발송결과 수정 --- .../egovframework/sqlmap/let/mjo/kakao/KakaoSent_SQL_Mysql.xml | 2 +- .../webapp/WEB-INF/jsp/web/kakao/sent/KakaoSentDetailView.jsp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/resources/egovframework/sqlmap/let/mjo/kakao/KakaoSent_SQL_Mysql.xml b/src/main/resources/egovframework/sqlmap/let/mjo/kakao/KakaoSent_SQL_Mysql.xml index 779d269d..c8930144 100644 --- a/src/main/resources/egovframework/sqlmap/let/mjo/kakao/KakaoSent_SQL_Mysql.xml +++ b/src/main/resources/egovframework/sqlmap/let/mjo/kakao/KakaoSent_SQL_Mysql.xml @@ -1850,7 +1850,7 @@ , MGD.USER_ID as userId , MGD.SMS_TXT as smsTxt , MGD.SUBJECT as subject - , DATE_FORMAT(MGD.REQ_DATE, '%Y-%m-%d %T') as reqDate + , DATE_FORMAT(MGD.REQ_DATE, '%Y-%m-%d %H:%i') as reqDate , DATE_FORMAT(MGD.REGDATE, '%Y-%m-%d %T') as regDate , MGD.MSG_TYPE as msgType , MGD.MSG_KIND as msgKind diff --git a/src/main/webapp/WEB-INF/jsp/web/kakao/sent/KakaoSentDetailView.jsp b/src/main/webapp/WEB-INF/jsp/web/kakao/sent/KakaoSentDetailView.jsp index d180fcf3..7ed7da8d 100644 --- a/src/main/webapp/WEB-INF/jsp/web/kakao/sent/KakaoSentDetailView.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/kakao/sent/KakaoSentDetailView.jsp @@ -659,7 +659,7 @@ function previewPhone(){
등록일시
-
+