From 18f00dc6559e32de18036a96d43364ca667508fd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B0=A2=E6=B4=AA=E9=BE=99?= <599179587@qq.com>
Date: Wed, 23 Aug 2017 12:16:55 +0800
Subject: [PATCH] =?UTF-8?q?=E6=95=B4=E5=90=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/webapp/META-INF/context.xml                | 2 +-
 src/main/webapp/WEB-INF/view/roleAdmin/userList.jsp | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/main/webapp/META-INF/context.xml b/src/main/webapp/META-INF/context.xml
index 5bee3dc..66d3c18 100644
--- a/src/main/webapp/META-INF/context.xml
+++ b/src/main/webapp/META-INF/context.xml
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Context antiJARLocking="true" path=""/>
+<Context antiJARLocking="true" path="/IfishSystem"/>
diff --git a/src/main/webapp/WEB-INF/view/roleAdmin/userList.jsp b/src/main/webapp/WEB-INF/view/roleAdmin/userList.jsp
index c76bb0b..66e5a92 100644
--- a/src/main/webapp/WEB-INF/view/roleAdmin/userList.jsp
+++ b/src/main/webapp/WEB-INF/view/roleAdmin/userList.jsp
@@ -23,6 +23,7 @@
                 $("#searchTable").find("select").addClass("searchClass");
                 //日期控件
                 $('#sSearch3,#sSearch4,#sSearch5,#sSearch6,#lastSigninDate').datepicker({
+                    language: 'zh-CN',
                     format: "yyyy-mm-dd"
                 });
                 //分页
@@ -312,7 +313,7 @@
                             goldTask(userId);
                             refreshTable();
                         });
-                    } 
+                    }
                 });
             }
             //经验任务