Merge remote-tracking branch 'origin/master'

admin

2019-01-05 407157c46e82f44b592ad18dd4367bc19209f909

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

@@ -154,6 +154,9 @@
      } catch (SwiperPictureException e) {

         e.printStackTrace();

      }

		
      data.put("desc", configService.get("invite_desc"));

		


      com.alibaba.fastjson.JSONObject root = new com.alibaba.fastjson.JSONObject();

      root.put("code", 0);