tolag3/mjon_git
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into 5102_친구톡_발송속도_개선

Browse Source
This commit is contained in:
hehihoho3@gmail.com 2025-04-15 11:48:26 +09:00
commit 808071372b
4 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/main/resources/egovframework/sqlmap/let/mjo/kakao/KakaoSent_SQL_Mysql.xml
View File

@ -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#
<isNotEmpty property="ntceBgnde">
AND DATE_FORMAT(MG.REQ_DATE, '%Y/%m/%d') BETWEEN #ntceBgnde# AND #ntceEndde#

6
src/main/webapp/WEB-INF/jsp/web/com/webCommonHeader.jsp
View File

@ -1616,14 +1616,14 @@ function actionLogin_end(){
</ul>
</dd>
</dl>
<dl>
<%-- <dl>
<dt><a href="<c:out value='/web/mjon/reservmsg/selectReservMsgView.do'/>">예약관리</a></dt>
<dd>
<ul>
<li><a href="<c:out value='/web/mjon/reservmsg/selectReservMsgView.do'/>">예약관리</a></li>
</ul>
</dd>
</dl>
</dl> --%>
</li>
<li>
<dl>
@ -1639,7 +1639,7 @@ function actionLogin_end(){
<li><a href="<c:out value='/web/user/sendNumberManage.do'/>" >발신번호 관리</a></li>
<li><a href="<c:out value='/web/user/notifyManage.do'/>" >알림설정</a></li>
<%-- <li><a href="<c:out value='/web/user/mberSecession.do'/>" >회원탈퇴</a></li> --%>
<li><a href="<c:out value='/web/user/kisaReport.do'/>" >KISA 신고</a></li>
<%-- <li><a href="<c:out value='/web/user/kisaReport.do'/>" >KISA 신고</a></li> --%>
</ul>
</dd>
</dl>

9
src/main/webapp/WEB-INF/jsp/web/kakao/msgdata/at/KakaoAlimtalkMsgDataView.jsp
View File

@ -1486,7 +1486,6 @@ $(window).on('load', function() {
<ul>
<li>* 변수명 설정파일을 다운로드 받으신 후 전송대상과 변수를 입력 후 업로드해주세요.</li>
<li>* 엑셀서식은 반드시 <span>텍스트 서식으로 등록</span>해주세요.</li>
<li>* 한번에 전송가능한 <span>최대 발송건은 500건</span>입니다.</li>
<li>* 배송조회시 운송장 번호는 <span>숫자만 등록</span>해주세요.</li>
</ul>
<button type="button" class="excel_btn" onclick="excelDownload();"><i></i> <c:out value="#"/>{변수명} 설정 파일 다운로드</button>
@ -1506,10 +1505,10 @@ $(window).on('load', function() {
<span>
<span class="vMiddle">*</span> 중복번호는 한번만 발송됩니다.
</span>
</br>
<span>
<span class="vMiddle">*</span> 한번에 전송가능한 최대 발송건은 500건 입니다.
</span>
<!-- </br> -->
<!-- <span> -->
<!-- <span class="vMiddle">*</span> 한번에 전송가능한 최대 발송건은 500건 입니다. -->
<!-- </span> -->
</div>
<div class="receipt_num_midde">
<div class="listType list01 callList_box_P">

4
src/main/webapp/publish/css/main.css
View File

@ -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;}