Merge remote-tracking branch 'remotes/origin/wmj' into zgl

# Conflicts:
#	.idea/dataSources/356b1cbb-8e8d-401f-bdfc-b3e917bc8301.corrupted.20190114-065036.xml

src/dao/DBManagement.java

@@ -105,8 +105,6 @@ public class DBManagement {
             put("graduation_design_reply_opinion_record_score","reply_ teacher_team_score_status");
             put("graduation_design_reply_opinion_record_score","reply_college_score_status");
             put("graduation_design_reply_opinion_record_score","reply_school_score_status");
-
-
         }
     };
     public static String driverClassName="org.mariadb.jdbc.Driver";