From 573c491b4a1ba60e12a5678a01c1546c0077c1ee Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 30 七月 2019 09:07:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
fanli/src/main/java/com/yeshi/fanli/entity/bus/user/UserCustomSettings.java | 12 ++++--------
1 files changed, 4 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..cf34276 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,17 @@
import org.yeshi.utils.mybatis.Table;
/**
- * 璁㈠崟-绠�鐗�
- *
- * @author yj
+ * 鐢ㄦ埛app鐣岄潰涓�у寲璁剧疆
+ * @author Administrator
*
- * @date 2018骞�12鏈�23鏃�
*/
-
@Table("yeshi_ec_user_custom_settings")
public class UserCustomSettings {
// 娑堟伅绫诲瀷鐨勬灇涓�
public enum UserSettingTypeEnum {
cancelNotice("閫氱煡鍏嶆墦鎵�(20:00-8:00)"), noNewsRedDot("涓嶇湅娑堟伅绾㈢偣鎻愰啋"), noBonusCount("涓嶇湅濂栭噾缁熻"),
- noShareRecordAndStorage("涓嶇湅鍒嗕韩璁板綍鍜岄�夊搧搴�"),noInvitationBonus("涓嶇湅閭�璇锋嬁濂栭噾");
+ noShareRecordAndStorage("涓嶇湅鍒嗕韩璁板綍鍜岄�夊搧搴�"),noInvitationBonus("涓嶇湅閭�璇锋嬁濂栭噾"), openSpreadHongBao("寮�鍚帹骞跨孩鍖�");
private final String desc;
@@ -46,7 +43,7 @@
// 鐘舵�侊細 榛樿0 1閫変腑
@Column(name = "ucs_state")
private Integer state;
-
+
// 鍒涘缓鏃堕棿
@Column(name = "ucs_create_time")
private Date createTime;
@@ -102,5 +99,4 @@
public void setUpdateTime(Date updateTime) {
this.updateTime = updateTime;
}
-
}
--
Gitblit v1.8.0