Merge remote-tracking branch 'origin/master'

yujian

2019-03-06 7c3277e2b1255d5948fb3c542db1ba5aff8ad0e1

 fanli/src/main/java/com/yeshi/fanli/controller/client/InviteGetMoneyController.java

@@ -278,6 +278,7 @@
            JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("激活失败"));

            return;

         }

			
         JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult("激活成功"));

         

      } catch (UserInfoExtraException e) {