Merge remote-tracking branch 'remotes/origin/master' into wlf

# Conflicts:
#	src/core/process/C_TeacherTeamFillOpeningReportOpinion.java

.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>

src/core/process/C_TeacherTeamFillOpeningReportOpinion.java

@@ -28,7 +28,7 @@ public class C_TeacherTeamFillOpeningReportOpinion extends TempProcess{
         fillInformation.execute(null);
     }
     protected boolean check() {
-        if(this.getGraduationDesignId()==null)
+        if(this.getGraduationDesignId()==null||this.getVMap()==null)
             return false;
         return true;
     }