From bdbdab5947541220d15dd425007185deb35f6a5d Mon Sep 17 00:00:00 2001
From: wan <2499498893@qq.com>
Date: Tue, 15 Jan 2019 00:11:34 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

# Conflicts:
#	.idea/misc.xml
#	src/core/process/C_StudentUploadOpeningReport.java
---
 .idea/artifacts/GDMS_war_exploded.xml | 2 +-
 .idea/misc.xml                        | 2 +-
 GDMS.iml                              | 6 +++---
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.idea/artifacts/GDMS_war_exploded.xml b/.idea/artifacts/GDMS_war_exploded.xml
index 95189d4..1d55d9c 100644
--- a/.idea/artifacts/GDMS_war_exploded.xml
+++ b/.idea/artifacts/GDMS_war_exploded.xml
@@ -8,8 +8,8 @@
           <element id="module-output" name="GDMS" />
         </element>
         <element id="directory" name="lib">
-          <element id="file-copy" path="C:/Program Files/apache-tomcat-9.0.13/lib/tomcat-jdbc.jar" />
           <element id="library" level="project" name="lib" />
+          <element id="library" level="project" name="tomcat-lib" />
         </element>
       </element>
     </root>
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 9486b47..df60b67 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_11" default="false" project-jdk-name="10" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_11" 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/GDMS.iml b/GDMS.iml
index b6ef183..20dda90 100644
--- a/GDMS.iml
+++ b/GDMS.iml
@@ -19,8 +19,8 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" exported="" name="lib" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Tomcat 8.5.37" level="application_server_libraries" />
-    <orderEntry type="library" name="tomcat-lib" level="project" />
+    <orderEntry type="library" exported="" scope="PROVIDED" name="lib" level="project" />
+    <orderEntry type="library" exported="" scope="PROVIDED" name="Tomcat 8.5.37" level="application_server_libraries" />
+    <orderEntry type="library" scope="PROVIDED" name="tomcat-lib" level="project" />
   </component>
 </module>
\ No newline at end of file