Merge remote-tracking branch 'origin/master' into debug

services/admin.go

@@ -227,8 +227,8 @@ QUERY_WX_USER:
 	}
 
 	adminId := adminWx.AdminId
-	if adminWx.Enabled != 1 {
-		err = errors.New("账户状态异常，不允许登录")
+	if adminId > 0 && adminWx.Enabled != 1 {
+		err = errors.New(fmt.Sprint("账户状态异常，不允许登录,ID：", adminId))
 		errMsg = `账户信息异常！`
 		return
 	}