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 | 3 +--
1 files changed, 1 insertions(+), 2 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 e0e52e0..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
@@ -43,7 +43,7 @@
// 鐘舵�侊細 榛樿0 1閫変腑
@Column(name = "ucs_state")
private Integer state;
-
+
// 鍒涘缓鏃堕棿
@Column(name = "ucs_create_time")
private Date createTime;
@@ -99,5 +99,4 @@
public void setUpdateTime(Date updateTime) {
this.updateTime = updateTime;
}
-
}
--
Gitblit v1.8.0