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

yujian

2019-07-23 a39422f2a8ce45dd6cf65701ed5f9e65391c46c1

 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;