diff --git a/src/main/java/com/mca/util/ImgPaginationRenderer.java b/src/main/java/com/mca/util/ImgPaginationRenderer.java
index 43d33c9..b9775ab 100644
--- a/src/main/java/com/mca/util/ImgPaginationRenderer.java
+++ b/src/main/java/com/mca/util/ImgPaginationRenderer.java
@@ -50,7 +50,47 @@ public class ImgPaginationRenderer extends AbstractPaginationRenderer implements
*
* @see 개발프레임웍크 실행환경 개발팀
*/
+
+ /*
+
+
+ */
public void initVariables() {
+<<<<<<< HEAD
+
+ firstPageLabel = "";//"
" + " ";
+ previousPageLabel = "\n" +
+ "\t\t\t\t\t \n" +
+ "\t\t\t\t\t\t«\n" +
+ "\t\t\t\t\t \n" +
+ "\t\t\t\t\t";
+ currentPageLabel = "{0} ";
+ otherPageLabel = "{2}";
+ nextPageLabel = "\n" +
+ "\t\t\t\t\t \n" +
+ "\t\t\t\t\t\t»\n" +
+ "\t\t\t\t\t \n" +
+ "\t\t\t\t\t";
+ lastPageLabel = "";//"" + " ";
+=======
// firstPageLabel = "" + " ";
firstPageLabel = "";//"" + " ";
previousPageLabel = "\n" +
@@ -66,6 +106,7 @@ public class ImgPaginationRenderer extends AbstractPaginationRenderer implements
"\t\t\t\t\t \n" +
"\t\t\t\t\t";
lastPageLabel = "";//""" + " ";
+>>>>>>> fe79f99402336104ee1532a6190dfbcb6ec1d1e3
}
@Override
diff --git a/src/main/webapp/WEB-INF/jsp/admin/request.jsp b/src/main/webapp/WEB-INF/jsp/admin/request.jsp
index 18cf0d2..fec4896 100644
--- a/src/main/webapp/WEB-INF/jsp/admin/request.jsp
+++ b/src/main/webapp/WEB-INF/jsp/admin/request.jsp
@@ -6,6 +6,126 @@
">
+<<<<<<< HEAD
+
+
+
+
+모바일센터 관리시스템
+">
+">
+" rel="stylesheet">
+" rel="stylesheet">
+" rel="stylesheet">
+
+
+
+ <%@ include file="../include/header.jsp"%>
+
+
+
+
+
+
+ " />
+
+
+
+
+ | 지도사용 요청 |
+
+ | 번호 |
+ 작업명 |
+ 소속 |
+ 담당자 |
+ 날짜 |
+ 상태 |
+
+
+
+
+
+
+ |
+ |
+ |
+ |
+ |
+
+
+
+
+
+
+ |
+
+
+
+
+ | 요청한 목록이 없습니다. |
+
+
+
+
+
+
+
+
+ <%--
+
+
+
+ «
+
+
+ 1
+ 2
+ 3
+ 4
+ 5
+
+
+ »
+
+
+ --%>
+
+
+
+