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 6c71ee63..5c376ef3 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 @@ -1539,6 +1539,7 @@ MG.MSG_GROUP_ID = BZP.MSG_GROUP_ID WHERE 1=1 AND IFNULL(MG.DEL_FLAG,'N') = 'N' + AND IFNULL(MD.DEL_FLAG,'N') = 'N' AND MD.USER_ID = #userId# AND DATE_FORMAT(MG.REQ_DATE, '%Y/%m/%d') BETWEEN #ntceBgnde# AND #ntceEndde# diff --git a/src/main/webapp/WEB-INF/jsp/web/com/webCommonHeader.jsp b/src/main/webapp/WEB-INF/jsp/web/com/webCommonHeader.jsp index 7231f629..2e5aecca 100644 --- a/src/main/webapp/WEB-INF/jsp/web/com/webCommonHeader.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/com/webCommonHeader.jsp @@ -1616,14 +1616,14 @@ function actionLogin_end(){ -
+ <%--
예약관리
-
+
--%>
  • @@ -1639,7 +1639,7 @@ function actionLogin_end(){
  • 발신번호 관리
  • 알림설정
  • <%--
  • 회원탈퇴
  • --%> -
  • KISA 신고
  • + <%--
  • KISA 신고
  • --%>
    diff --git a/src/main/webapp/WEB-INF/jsp/web/kakao/msgdata/at/KakaoAlimtalkMsgDataView.jsp b/src/main/webapp/WEB-INF/jsp/web/kakao/msgdata/at/KakaoAlimtalkMsgDataView.jsp index f05fda0e..d5b2e0da 100644 --- a/src/main/webapp/WEB-INF/jsp/web/kakao/msgdata/at/KakaoAlimtalkMsgDataView.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/kakao/msgdata/at/KakaoAlimtalkMsgDataView.jsp @@ -1486,7 +1486,6 @@ $(window).on('load', function() { @@ -1506,10 +1505,10 @@ $(window).on('load', function() { * 중복번호는 한번만 발송됩니다. -
    - - * 한번에 전송가능한 최대 발송건은 500건 입니다. - + + + +
    diff --git a/src/main/webapp/publish/css/main.css b/src/main/webapp/publish/css/main.css index b1ba2990..911bca2b 100644 --- a/src/main/webapp/publish/css/main.css +++ b/src/main/webapp/publish/css/main.css @@ -57,9 +57,9 @@ .swiper2 .contWrap .slide_cont1 {padding: 0 30px 0 36px; height: 190px; } .swiper2 .contWrap .slide_cont1 .cont1_title {font-size: 22px;font-weight: 700; padding:25px 0 0 0;} .swiper2 .contWrap .slide_cont1 .cont_ex {display:flex; justify-content: space-between;} -.swiper2 .contWrap .slide_cont1 .cont_ex .txt {padding:13px 0 0 0; line-height: 1.4; width:70%; color:#555; font-size: 16px; letter-spacing: -1px;} +.swiper2 .contWrap .slide_cont1 .cont_ex .txt {padding:13px 0 0 0; line-height: 1.4; width:70%; color:#555; font-size: 16px; letter-spacing: -1px; word-wrap:break-word;} .swiper2 .contWrap .slide_cont1 .cont_ex .bg_icon {position:relative; background-color: #e1e1e5; border-radius: 50%; top:50px; right:0; transform: translateY(-50%); width: 70px; height: 70px; display:flex; justify-content: center; align-items: center; } -.swiper2 .contWrap .slide_cont1 .cont_ex .bg_icon img {width: auto; height: auto; max-width: initial; max-height: initial;} +.swiper2 .contWrap .slide_cont1 .cont_ex .bg_icon img {width: auto; height: auto; max-width: 70px; max-height: 70px;} .swiper2 .contWrap .slide_cont1 .more {margin:5px 0 0 0; width: 115px;height: 30px; padding-right:15px;border: 1px solid #d9d9d9; border-radius: 14px; text-align: center; color: #555;background-image: url(../images/main/cont1_arrow.png);background-position: 86% center;background-repeat: no-repeat;line-height: 29px;}