From a010ba8f45596221f176a6ce0ef5121b6fa9a612 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=BD=95=E6=A5=9A?= <823169880@qq.com>
Date: Tue, 15 Jan 2019 22:01:36 +0800
Subject: [PATCH] Merge remote-tracking branch 'remotes/origin/master' into
 hechu1

# Conflicts:
#	src/core/process/C_TeacherSearchStudent.java
#	web/jsFile/upload_action.js
---
 .../artifacts/{GDMS_war_exploded.xml => gdms_war_exploded.xml} | 3 +++
 .idea/misc.xml                                                 | 2 +-
 .idea/vcs.xml                                                  | 1 -
 3 files changed, 4 insertions(+), 2 deletions(-)
 rename .idea/artifacts/{GDMS_war_exploded.xml => gdms_war_exploded.xml} (70%)

diff --git a/.idea/artifacts/GDMS_war_exploded.xml b/.idea/artifacts/gdms_war_exploded.xml
similarity index 70%
rename from .idea/artifacts/GDMS_war_exploded.xml
rename to .idea/artifacts/gdms_war_exploded.xml
index 6d1dc1a..110c240 100644
--- a/.idea/artifacts/GDMS_war_exploded.xml
+++ b/.idea/artifacts/gdms_war_exploded.xml
@@ -7,6 +7,9 @@
         <element id="directory" name="classes">
           <element id="module-output" name="gdms" />
         </element>
+        <element id="directory" name="lib">
+          <element id="file-copy" path="C:/Program Files/Apache Software Foundation/Tomcat 9.0/lib/tomcat-jdbc.jar" />
+        </element>
       </element>
     </root>
   </artifact>
diff --git a/.idea/misc.xml b/.idea/misc.xml
index bfbb0ff..35bdbab 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_10" default="true" project-jdk-name="10" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_10" default="false" project-jdk-name="11" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/out" />
   </component>
 </project>
\ No newline at end of file
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
index 8306744..35eb1dd 100644
--- a/.idea/vcs.xml
+++ b/.idea/vcs.xml
@@ -2,6 +2,5 @@
 <project version="4">
   <component name="VcsDirectoryMappings">
     <mapping directory="" vcs="Git" />
-    <mapping directory="$PROJECT_DIR$" vcs="Git" />
   </component>
 </project>
\ No newline at end of file