back_recharge
wangyuan 2019-05-11 17:28:44 +08:00
parent ac3585efc3
commit c5b27e63d4
1 changed files with 3 additions and 6 deletions

View File

@ -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
}
}