Merge branch 'master' into kakaoFT
@6a3d4fe50b53f2b71a6069c73aa2e803c415b6e1
--- src/main/webapp/WEB-INF/jsp/layout/include/defaultResource.jsp
+++ src/main/webapp/WEB-INF/jsp/layout/include/defaultResource.jsp
... | ... | @@ -71,7 +71,7 @@ |
| 71 | 71 |
<script type="text/javascript" src="/js/fileupload/jquery.fileupload.js"></script> |
| 72 | 72 |
|
| 73 | 73 |
<script type="text/javascript" src="https://code.jquery.com/ui/1.12.1/jquery-ui.min.js"></script> |
| 74 |
- <script type="text/javascript" src="/js/MJUtill.js?date=202306140010"></script> |
|
| 74 |
+ <script type="text/javascript" src="/js/MJUtill.js?date=202401291830"></script> |
|
| 75 | 75 |
|
| 76 | 76 |
<!-- Uncaught TypeError: e.widget is not a function로 인해 가장 마지막에 선언_이준호_220510 --> |
| 77 | 77 |
<script type="text/javascript" src="/dist/js/jquery_wrapper.min.js"></script> |
--- src/main/webapp/WEB-INF/jsp/web/msgcampain/MsgDataSMLView.jsp
+++ src/main/webapp/WEB-INF/jsp/web/msgcampain/MsgDataSMLView.jsp
... | ... | @@ -2432,8 +2432,6 @@ |
| 2432 | 2432 |
data: data, |
| 2433 | 2433 |
dataType:'json', |
| 2434 | 2434 |
async: true, |
| 2435 |
- processData: false, |
|
| 2436 |
- contentType: false, |
|
| 2437 | 2435 |
cache: false, |
| 2438 | 2436 |
success: function (returnData, status) {
|
| 2439 | 2437 |
if(status == 'success'){ // status 확인 필요한가. 석세스 안뜨면 에러 가지 않나
|
--- src/main/webapp/WEB-INF/jsp/web/msgcampain/addr/MsgAddrGroupListAjax.jsp
+++ src/main/webapp/WEB-INF/jsp/web/msgcampain/addr/MsgAddrGroupListAjax.jsp
... | ... | @@ -6,6 +6,9 @@ |
| 6 | 6 |
<script type="text/javascript"> |
| 7 | 7 |
$(document).ready(function(){
|
| 8 | 8 |
|
| 9 |
+ var sTime = new Date(); |
|
| 10 |
+ console.log("sTime ::: "+sTime);
|
|
| 11 |
+ |
|
| 9 | 12 |
// 주소록 그룹 카운트(전체) |
| 10 | 13 |
getAddrGroupTotCnt(); |
| 11 | 14 |
|
... | ... | @@ -15,6 +18,9 @@ |
| 15 | 18 |
//주소록 그룹 카운트(자주보내는 번호) |
| 16 | 19 |
getAddrGroupBookmarkCnt(); |
| 17 | 20 |
|
| 21 |
+ var lTime = new Date(); |
|
| 22 |
+ console.log("lTime ::: "+lTime);
|
|
| 23 |
+ |
|
| 18 | 24 |
}); |
| 19 | 25 |
|
| 20 | 26 |
// 주소록 그룹 카운트(전체) |
--- src/main/webapp/WEB-INF/jsp/web/msgcampain/tw/MsgTWDataSMLView.jsp
+++ src/main/webapp/WEB-INF/jsp/web/msgcampain/tw/MsgTWDataSMLView.jsp
... | ... | @@ -2565,8 +2565,6 @@ |
| 2565 | 2565 |
data: data, |
| 2566 | 2566 |
dataType:'json', |
| 2567 | 2567 |
async: true, |
| 2568 |
- processData: false, |
|
| 2569 |
- contentType: false, |
|
| 2570 | 2568 |
cache: false, |
| 2571 | 2569 |
success: function (returnData, status) {
|
| 2572 | 2570 |
if(status == 'success'){ // status 확인 필요한가. 석세스 안뜨면 에러 가지 않나
|
--- src/main/webapp/WEB-INF/jsp/web/msgdata/MsgDataSMLView.jsp
+++ src/main/webapp/WEB-INF/jsp/web/msgdata/MsgDataSMLView.jsp
... | ... | @@ -2691,8 +2691,6 @@ |
| 2691 | 2691 |
data: data, |
| 2692 | 2692 |
dataType:'json', |
| 2693 | 2693 |
async: true, |
| 2694 |
- processData: false, |
|
| 2695 |
- contentType: false, |
|
| 2696 | 2694 |
cache: false, |
| 2697 | 2695 |
success: function (returnData, status) {
|
| 2698 | 2696 |
if(status == 'success'){ // status 확인 필요한가. 석세스 안뜨면 에러 가지 않나
|
--- src/main/webapp/WEB-INF/jsp/web/pay/PayUserSWListAjax.jsp
+++ src/main/webapp/WEB-INF/jsp/web/pay/PayUserSWListAjax.jsp
... | ... | @@ -275,7 +275,7 @@ |
| 275 | 275 |
<input type="checkbox" name="eachChk"> |
| 276 | 276 |
</td> --%> |
| 277 | 277 |
<td> |
| 278 |
- <p><c:out value="${payUserInfo.regDate}"/></p>
|
|
| 278 |
+ <p><c:out value="${payUserInfo.reqDate}"/></p>
|
|
| 279 | 279 |
</td> |
| 280 | 280 |
<td> |
| 281 | 281 |
<c:choose> |
Add a comment
Delete comment
Once you delete this comment, you won't be able to recover it. Are you sure you want to delete this comment?