Merge remote-tracking branch 'origin/master'

liujie

8 天以前 7342170db7dc39326698d39b74e1858502fd574a

 DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/zhenglian/TokenUtil.java

@@ -82,7 +82,8 @@
         log.error("获取token失败！{}", bizData.getString("resMsg"));
         throw new Exception(jsonObject.getString("resMsg"));
      }
      return bizData.getString("token");
      JSONObject resData = bizData.getJSONObject("resData");
      return resData.getString("token");
   }
   
}