rebase and resubmit
Change-Id: I840888ad5aadceaacb5cd64c6472614cd82ffe17
diff --git a/src/main/java/database/DataManagerInterface.java b/src/main/java/database/DataManagerInterface.java
index d284288..2304567 100644
--- a/src/main/java/database/DataManagerInterface.java
+++ b/src/main/java/database/DataManagerInterface.java
@@ -1,12 +1,12 @@
package database;
-import object.BegInfo;
-import object.Notice;
-import object.Post;
-import object.Profile;
-import object.Seed;
-import object.User;
-import object.UserPT;
+import entity.BegInfo;
+import entity.Notice;
+import entity.Post;
+import entity.Profile;
+import entity.Seed;
+import entity.User;
+import entity.UserPT;
public interface DataManagerInterface{
//DB1
diff --git a/src/main/java/database/Database2.java b/src/main/java/database/Database2.java
index 79c55f9..8d919b6 100644
--- a/src/main/java/database/Database2.java
+++ b/src/main/java/database/Database2.java
@@ -12,19 +12,19 @@
import com.querydsl.jpa.impl.JPAQuery;
import com.querydsl.core.Tuple;
-import object.QBegInfo;
-import object.QUserVotes;
-import object.QSubmitSeed;
-import object.QProfile;
-import object.QSeed;
-import object.Seed;
-import object.User;
-import object.UserPT;
-import object.Notice;
-import object.BegInfo;
-import object.Post;
-import object.PostReply;
-import object.Profile;
+import entity.QBegInfo;
+import entity.QUserVotes;
+import entity.QSubmitSeed;
+import entity.QProfile;
+import entity.QSeed;
+import entity.Seed;
+import entity.User;
+import entity.UserPT;
+import entity.Notice;
+import entity.BegInfo;
+import entity.Post;
+import entity.PostReply;
+import entity.Profile;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;