root
/
miduo_server
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix

back_recharge
wangyuan 2019-05-11 17:28:44 +08:00
parent ac3585efc3
commit c5b27e63d4
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
serverlogic/src/main/java/com/ljsd/jieling/logic/dao/root/User.java
View File

@ -38,11 +38,9 @@ public class User {
private ArenaManager arenaManager; private ArenaManager arenaManager;
<<<<<<< HEAD
private SecretBoxManager secretBoxManager; private SecretBoxManager secretBoxManager;
=======
private StoreManager storeManager; private StoreManager storeManager;
>>>>>>> 08935d2c7e00852ea7f3cb4951827c00faac6902
//构造函数必须要声明，否则从mongodb读出来反编译成类不通过 //构造函数必须要声明，否则从mongodb读出来反编译成类不通过
public User(){ public User(){
@ -176,12 +174,11 @@ public class User {
return arenaManager; return arenaManager;
} }
<<<<<<< HEAD
public SecretBoxManager getSecretBoxManager() { public SecretBoxManager getSecretBoxManager() {
return secretBoxManager; return secretBoxManager;
======= }
public StoreManager getStoreManager() { public StoreManager getStoreManager() {
return storeManager; return storeManager;
>>>>>>> 08935d2c7e00852ea7f3cb4951827c00faac6902
} }
} }