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 | 23 +++++++++++++++--------
1 files changed, 15 insertions(+), 8 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 026267c..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
@@ -6,20 +6,28 @@
import org.yeshi.utils.mybatis.Table;
/**
- * 璁㈠崟-绠�鐗�
+ * 鐢ㄦ埛app鐣岄潰涓�у寲璁剧疆
*
- * @author yj
+ * @author Administrator
*
- * @date 2018骞�12鏈�23鏃�
*/
-
@Table("yeshi_ec_user_custom_settings")
public class UserCustomSettings {
+ public static int STATE_VALID = 1;
+
+ public static int STATE_INVALID = 0;
+
// 娑堟伅绫诲瀷鐨勬灇涓�
public enum UserSettingTypeEnum {
- cancelNotice("閫氱煡鍏嶆墦鎵�(20:00-8:00)"), noNewsRedDot("涓嶇湅娑堟伅绾㈢偣鎻愰啋"), noBonusCount("涓嶇湅濂栭噾缁熻"),
- noShareRecordAndStorage("涓嶇湅鍒嗕韩璁板綍鍜岄�夊搧搴�"),noInvitationBonus("涓嶇湅閭�璇锋嬁濂栭噾");
+ cancelNotice("閫氱煡鍏嶆墦鎵�(20:00-8:00)"),
+ noNewsRedDot("涓嶇湅娑堟伅绾㈢偣鎻愰啋"),
+ noBonusCount("涓嶇湅濂栭噾缁熻"),
+ noShareRecordAndStorage("涓嶇湅鍒嗕韩璁板綍鍜岄�夊搧搴�"),
+ noInvitationBonus("涓嶇湅閭�璇锋嬁濂栭噾"),
+ openSpreadHongBao("寮�鍚帹骞跨孩鍖�"),
+ noDisplayPhoneNum("涓嶅厑璁告煡鐪嬫墜鏈哄彿鐮�");
+
private final String desc;
@@ -43,7 +51,7 @@
@Column(name = "ucs_type")
private UserSettingTypeEnum type;
- // 鐘舵�侊細 榛樿0 1閫変腑
+ // 鐘舵�侊細 榛樿0 1閫変腑
@Column(name = "ucs_state")
private Integer state;
@@ -102,5 +110,4 @@
public void setUpdateTime(Date updateTime) {
this.updateTime = updateTime;
}
-
}
--
Gitblit v1.8.0