From 5f1f5837191a1e13792b489701cadefc191cfce9 Mon Sep 17 00:00:00 2001
From: zgl <1021946233@qq.com>
Date: Wed, 16 Jan 2019 10:01:12 +0800
Subject: [PATCH] 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 | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/dao/DBManagement.java b/src/dao/DBManagement.java
index 83a1396..102b462 100644
--- 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";