diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/root/User.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/root/User.java index 77a7ebe49..8fc4422e3 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/root/User.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/root/User.java @@ -38,11 +38,9 @@ public class User { private ArenaManager arenaManager; -<<<<<<< HEAD private SecretBoxManager secretBoxManager; -======= + private StoreManager storeManager; ->>>>>>> 08935d2c7e00852ea7f3cb4951827c00faac6902 //构造函数必须要声明,否则从mongodb读出来反编译成类不通过 public User(){ @@ -176,12 +174,11 @@ public class User { return arenaManager; } -<<<<<<< HEAD + public SecretBoxManager getSecretBoxManager() { return secretBoxManager; -======= + } public StoreManager getStoreManager() { return storeManager; ->>>>>>> 08935d2c7e00852ea7f3cb4951827c00faac6902 } }