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

# Conflicts: # .idea/dataSources/356b1cbb-8e8d-401f-bdfc-b3e917bc8301.corrupted.20190114-065036.xml
6 years ago · 5f1f583719
parent 98b8eb8987
commit 5f1f583719
1 changed files with 0 additions and 2 deletions
--- a/src/dao/DBManagement.java
+++ b/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";