From d8359ddb48dab5cc797a9d552e11fde571f4920c Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期二, 27 八月 2019 12:32:46 +0800
Subject: [PATCH] Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div
---
fanli/src/main/java/com/yeshi/fanli/entity/bus/user/UserCustomSettings.java | 14 +++++++++-----
1 files changed, 9 insertions(+), 5 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 2320cdd..9d96ab3 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
@@ -7,17 +7,22 @@
/**
* 鐢ㄦ埛app鐣岄潰涓�у寲璁剧疆
+ *
* @author Administrator
*
*/
@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("寮�鍚帹骞跨孩鍖�");
+
private final String desc;
private UserSettingTypeEnum(String desc) {
@@ -40,7 +45,7 @@
@Column(name = "ucs_type")
private UserSettingTypeEnum type;
- // 鐘舵�侊細 榛樿0 1閫変腑
+ // 鐘舵�侊細 榛樿0 1閫変腑
@Column(name = "ucs_state")
private Integer state;
@@ -99,5 +104,4 @@
public void setUpdateTime(Date updateTime) {
this.updateTime = updateTime;
}
-
}
--
Gitblit v1.8.0