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

# Conflicts:
                                                 #	src/servlet/S_StudentUploadOpeningReport.java

src/core/process/C_MentorFillOpeningReportOpinion.java

@@ -10,8 +10,7 @@ import java.util.Map;
 
 public class C_MentorFillOpeningReportOpinion extends TempProcess{
 
-    String studentId;
+    String graduationDesignId;
-    String  mentor_opinion;
     Map<String,String> vMap;
 
     static String table="graduation_design_opening_report_opinion_record";
@@ -25,30 +24,26 @@ public class C_MentorFillOpeningReportOpinion extends TempProcess{
         String date=df.format(new Date());
         vMap.put("mentor_opinion_date",date);
         Map<String, String>limits = new HashMap<>();
-        limits.put("id",this.getStudentId());
+        limits.put("id",this.getGraduationDesignId());
         fillInformation.addOptions("limits",limits);
         fillInformation.execute(null);
 
     }
     protected boolean check() {
-        if(this.getMentor_opinion()==null||this.getStudentId()==null)
+        if(this.getGraduationDesignId()==null)
             return false;
         return true;
     }
-    public String getStudentId() {
+    @Override
-        return studentId;
+    public String getGraduationDesignId() {
+        return graduationDesignId;
     }
 
-    public void setStudentId(String studentId) {
+    @Override
-        this.studentId = studentId;
+    public void setGraduationDesignId(String graduationDesignId) {
-    }
+        this.graduationDesignId = graduationDesignId;
-    public String getMentor_opinion() {
-        return mentor_opinion;
     }
 
-    public void setMentor_opinion(String mentor_opinion) {
-        this.mentor_opinion = mentor_opinion;
-    }
 
     public void setVMap(Map<String, String> vMap) {
         this.vMap = vMap;