Merge remote-tracking branch 'origin/feature-201820-wangcz' into feature-201820-wangcz

src/main/java/com/uas/platform/b2c/common/account/service/impl/UserServiceImpl.java

@@ -610,13 +610,12 @@ public class UserServiceImpl implements UserService {
 
 	@Override
 	public User switchEnterprise(Long enUU) {
-		User user = userDao.findOne(SystemSession.getUser().getUserUU());
+		User user = SystemSession.getUser();
 		if ( enUU == 0L) {
 			user.setEnterprise(null);
 		} else {
 			user.setCurrentEnterprise(enUU);
 		}
-		SystemSession.setUser(user);
 		return user;
 	}