From 1e560eced85a5b888b6f86f5fafebfcd24f26f58 Mon Sep 17 00:00:00 2001 From: ijunho Date: Mon, 14 Apr 2025 17:04:07 +0900 Subject: [PATCH 1/4] =?UTF-8?q?Merge=20branch=20'master=5Ftolag3'=20?= =?UTF-8?q?=EC=95=8C=EB=A6=BC=ED=86=A1=20=EB=B0=9C=EC=86=A1=EA=B2=B0?= =?UTF-8?q?=EA=B3=BC=20=EC=A0=84=EC=B2=B4/=EC=95=8C=EB=A6=BC=ED=86=A1=20?= =?UTF-8?q?=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../egovframework/sqlmap/let/mjo/kakao/KakaoSent_SQL_Mysql.xml | 1 + 1 file changed, 1 insertion(+) 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# From fa05aec591382276a455f689ca62a66ea8f95e96 Mon Sep 17 00:00:00 2001 From: kmg Date: Mon, 14 Apr 2025 18:28:54 +0900 Subject: [PATCH 2/4] =?UTF-8?q?2025/04/14=20=EC=84=9C=EB=B9=84=EC=8A=A4?= =?UTF-8?q?=EC=95=88=EB=82=B4=20=EB=B0=B0=EB=84=88=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/webapp/publish/css/main.css | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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;} From 9420b058950396e301b67d38d28248e528055412 Mon Sep 17 00:00:00 2001 From: tolag3 Date: Tue, 15 Apr 2025 11:11:26 +0900 Subject: [PATCH 3/4] =?UTF-8?q?=ED=97=A4=EB=8D=94=20=EC=82=AC=EC=9D=B4?= =?UTF-8?q?=ED=8A=B8=EB=A7=B5=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/webapp/WEB-INF/jsp/web/com/webCommonHeader.jsp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) 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 신고
    • --%>
    From eef77f7c3d1de67127cb808091fa3b297c048c3c Mon Sep 17 00:00:00 2001 From: "hehihoho3@gmail.com" Date: Tue, 15 Apr 2025 11:48:01 +0900 Subject: [PATCH 4/4] =?UTF-8?q?=EC=95=8C=EB=A6=BC=ED=86=A1=20500=EA=B1=B4?= =?UTF-8?q?=20=EC=A0=9C=ED=95=9C=20=ED=85=8D=EC=8A=A4=ED=8A=B8=20=EC=88=98?= =?UTF-8?q?=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../web/kakao/msgdata/at/KakaoAlimtalkMsgDataView.jsp | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) 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() {
    • * 변수명 설정파일을 다운로드 받으신 후 전송대상과 변수를 입력 후 업로드해주세요.
    • * 엑셀서식은 반드시 텍스트 서식으로 등록해주세요.
      • -
    • * 한번에 전송가능한 최대 발송건은 500건입니다.
    • * 배송조회시 운송장 번호는 숫자만 등록해주세요.
    @@ -1506,10 +1505,10 @@ $(window).on('load', function() { * 중복번호는 한번만 발송됩니다. -
    - - * 한번에 전송가능한 최대 발송건은 500건 입니다. - + + + +