Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div

yujian

2019-07-25 a6f01cf9667958ca3d5c2f2ef28637baa8bf5e6d

 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;