From 687ce0df5bd7b4a0e6f26a9dbe5d932315cd007c Mon Sep 17 00:00:00 2001
From: wlf <920607690@qq.com>
Date: Mon, 14 Jan 2019 21:11:54 +0800
Subject: [PATCH] Merge remote-tracking branch 'remotes/origin/wmj' into wlf

# Conflicts:
#	src/core/process/C_StudentUploadOpeningReport.java
---
 .idea/misc.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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