From 98b1a0affd69bbe63223c21fdd2c404e8bedfccb Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 20 五月 2020 17:25:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into 2.1.2
---
fanli/src/main/java/com/yeshi/fanli/entity/bus/user/UserCustomSettings.java | 12 +++++++++---
1 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/entity/bus/user/UserCustomSettings.java b/fanli/src/main/java/com/yeshi/fanli/entity/bus/user/UserCustomSettings.java
index 9d96ab3..726bfa6 100644
--- a/fanli/src/main/java/com/yeshi/fanli/entity/bus/user/UserCustomSettings.java
+++ b/fanli/src/main/java/com/yeshi/fanli/entity/bus/user/UserCustomSettings.java
@@ -20,9 +20,15 @@
// 娑堟伅绫诲瀷鐨勬灇涓�
public enum UserSettingTypeEnum {
- cancelNotice("閫氱煡鍏嶆墦鎵�(20:00-8:00)"), noNewsRedDot("涓嶇湅娑堟伅绾㈢偣鎻愰啋"), noBonusCount("涓嶇湅濂栭噾缁熻"), noShareRecordAndStorage(
- "涓嶇湅鍒嗕韩璁板綍鍜岄�夊搧搴�"), noInvitationBonus("涓嶇湅閭�璇锋嬁濂栭噾"), openSpreadHongBao("寮�鍚帹骞跨孩鍖�");
-
+ cancelNotice("閫氱煡鍏嶆墦鎵�(20:00-8:00)"),
+ noNewsRedDot("涓嶇湅娑堟伅绾㈢偣鎻愰啋"),
+ noBonusCount("涓嶇湅濂栭噾缁熻"),
+ noShareRecordAndStorage("涓嶇湅鍒嗕韩璁板綍鍜岄�夊搧搴�"),
+ noInvitationBonus("涓嶇湅閭�璇锋嬁濂栭噾"),
+ openSpreadHongBao("寮�鍚帹骞跨孩鍖�"),
+ noDisplayPhoneNum("涓嶅厑璁告煡鐪嬫墜鏈哄彿鐮�");
+
+
private final String desc;
private UserSettingTypeEnum(String desc) {
--
Gitblit v1.8.0