Merge branch 'master-new' into div

yujian

2019-06-24 4c68642aad8889ff599af52d33453c483f13092a

 fanli/src/main/java/com/yeshi/fanli/controller/client/v1/UserInfoController.java

@@ -578,7 +578,9 @@
      if (mySettings.getNoInvitationBonus() == null) {

         mySettings.setNoInvitationBonus(0);

      }



      if (mySettings.getOpenSpreadHongBao() == null) {

         mySettings.setOpenSpreadHongBao(0);

      }

      data.put("moduleState", mySettings);



      int welfareCenterNews = 0;

@@ -2088,6 +2090,9 @@
         if (mySettings.getNoInvitationBonus() == null) {

            mySettings.setNoInvitationBonus(0);

         }

         if (mySettings.getOpenSpreadHongBao() == null) {

            mySettings.setOpenSpreadHongBao(0);

         }

         data.put("moduleState", mySettings);



         int welfareCenterNews = 0;