rosewiper 2024-01-31
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
+++ src/main/webapp/WEB-INF/jsp/layout/include/defaultResource.jsp
@@ -71,7 +71,7 @@
 				<script type="text/javascript" src="/js/fileupload/jquery.fileupload.js"></script>
 		
 		<script type="text/javascript" src="https://code.jquery.com/ui/1.12.1/jquery-ui.min.js"></script>
-		<script type="text/javascript" src="/js/MJUtill.js?date=202306140010"></script>
+		<script type="text/javascript" src="/js/MJUtill.js?date=202401291830"></script>
 		
 		<!-- Uncaught TypeError: e.widget is not a function로 인해 가장 마지막에 선언_이준호_220510 -->
 		<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
+++ src/main/webapp/WEB-INF/jsp/web/msgcampain/MsgDataSMLView.jsp
@@ -2432,8 +2432,6 @@
         data: data,
         dataType:'json',
         async: true,
-        processData: false,
-        contentType: false,
         cache: false,
         success: function (returnData, status) {
 			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
+++ src/main/webapp/WEB-INF/jsp/web/msgcampain/addr/MsgAddrGroupListAjax.jsp
@@ -6,6 +6,9 @@
 <script type="text/javascript">
 $(document).ready(function(){
 	
+	var sTime = new Date();
+	console.log("sTime ::: "+sTime);
+	
 	// 주소록 그룹 카운트(전체)
 	getAddrGroupTotCnt();
 
@@ -15,6 +18,9 @@
 	//주소록 그룹 카운트(자주보내는 번호)
 	getAddrGroupBookmarkCnt();
 	
+	var lTime = new Date();
+	console.log("lTime ::: "+lTime);
+	
 }); 
 
 // 주소록 그룹 카운트(전체)
src/main/webapp/WEB-INF/jsp/web/msgcampain/tw/MsgTWDataSMLView.jsp
--- 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 @@
         data: data,
         dataType:'json',
         async: true,
-        processData: false,
-        contentType: false,
         cache: false,
         success: function (returnData, status) {
 			if(status == 'success'){ // status 확인 필요한가. 석세스 안뜨면 에러 가지 않나
src/main/webapp/WEB-INF/jsp/web/msgdata/MsgDataSMLView.jsp
--- src/main/webapp/WEB-INF/jsp/web/msgdata/MsgDataSMLView.jsp
+++ src/main/webapp/WEB-INF/jsp/web/msgdata/MsgDataSMLView.jsp
@@ -2691,8 +2691,6 @@
         data: data,
         dataType:'json',
         async: true,
-        processData: false,
-        contentType: false,
         cache: false,
         success: function (returnData, status) {
 			if(status == 'success'){ // status 확인 필요한가. 석세스 안뜨면 에러 가지 않나
src/main/webapp/WEB-INF/jsp/web/pay/PayUserSWListAjax.jsp
--- src/main/webapp/WEB-INF/jsp/web/pay/PayUserSWListAjax.jsp
+++ src/main/webapp/WEB-INF/jsp/web/pay/PayUserSWListAjax.jsp
@@ -275,7 +275,7 @@
 									<input type="checkbox" name="eachChk">
 								</td> --%>
 								<td>
-									<p><c:out value="${payUserInfo.regDate}"/></p>
+									<p><c:out value="${payUserInfo.reqDate}"/></p>
 								</td>
 								<td>
 									<c:choose>
Add a comment
List