Merge remote-tracking branch 'origin/div' into div

admin

2019-09-03 74ee9c42c1d87f3724a21e92871bc8c95c8364c6

 fanli/src/main/java/com/yeshi/fanli/service/inter/user/UserAccountService.java

@@ -5,7 +5,7 @@


import com.yeshi.fanli.entity.bus.user.LoginResult;

import com.yeshi.fanli.entity.bus.user.UserInfo;

import com.yeshi.fanli.exception.UserAccountException;

import com.yeshi.fanli.exception.user.UserAccountException;



/**

 * 登录服务