Merge remote-tracking branch 'origin/dev-sx' into dev-sx

src/main/java/com/baosight/hpjx/hp/xs/service/ServiceHPXSUser.java

@@ -58,7 +58,6 @@ public class ServiceHPXSUser extends ServiceBase {
 		return outInfo;
 	}
 	
-	
 	/**
 	 * 获取用户信息
 	 *
@@ -74,7 +73,7 @@ public class ServiceHPXSUser extends ServiceBase {
 			if (StringUtils.isNotEmpty(loginName)) {
 				Map map = new HashMap();
 				map.put("loginName", loginName);
-				List<User> users = dao.query("HGXSUser.query", map);
+				List<User> users = dao.query("HPXSUser.query", map);
 				if (users != null && users.size() > 0) {
 					status = 1;
 					msg = "用户存在!";