Merge branch 'master-new' into div

yujian

2019-06-24 4c68642aad8889ff599af52d33453c483f13092a

 fanli/src/main/java/com/yeshi/fanli/entity/bus/user/UserCustomSettings.java

@@ -16,7 +16,7 @@
   // 消息类型的枚举

   public enum UserSettingTypeEnum {

      cancelNotice("通知免打扰(20:00-8:00)"), noNewsRedDot("不看消息红点提醒"), noBonusCount("不看奖金统计"),

      noShareRecordAndStorage("不看分享记录和选品库"),noInvitationBonus("不看邀请拿奖金");

      noShareRecordAndStorage("不看分享记录和选品库"),noInvitationBonus("不看邀请拿奖金"), openSpreadHongBao("开启推广红包");

      

      private final String desc;