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

yujian

2019-05-05 b63c28a0c24782753eae26892171dd1a0c8d1fe7

 fanli/src/main/java/com/yeshi/fanli/util/wx/WXLoginUtil.java

@@ -74,7 +74,7 @@
      return weiXinUser;

   }



   private static WeiXinUser getWeiXinUser(String code) {

   public static WeiXinUser getWeiXinUser(String code) {

      WeiXinUserParam param = getWxParam(code);

      if (param == null) {

         return null;