Merge remote-tracking branch 'origin/master'

src/main/java/com/chinaitop/depot/system/controller/UserInfoController.java

@@ -91,7 +91,7 @@ public class UserInfoController {
 	
 	@Value("${localOrCloud}")
 	private String localOrCloud;
-	
+
 	@Value("${forTheConnection}")
 	private String forTheConnection;
 	
@@ -192,14 +192,14 @@ public class UserInfoController {
 	})
 	public Map<String, Object> Login(HttpServletRequest request, String username, String password, String yzm, String from) {
 		Map<String, Object> map = new HashMap<String, Object>();
-		if (StringUtils.isBlank(from) || from.compareTo("app")!=0) {
+		/*if (StringUtils.isBlank(from) || from.compareTo("app")!=0) {
 			String yzm_code = ObjectUtils.toString(request.getSession().getAttribute("Service_Code"),"");
 			if (!yzm_code.equals(yzm)) {
 				map.put("status", false);
 				map.put("success", "验证码输入错误！");
 				return map;
 			}
-		}
+		}*/
 		UserInfo userInfo = null;
 		if(!userInfoService.validUsername(null,username)) {//用户名存在
 			/**************************限制单个用户的同时重复登录操作************************/