From 0e5e21d2f3693dc993b3f49d88a275f7b226eba5 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期六, 19 一月 2019 17:38:49 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 fanli/src/main/java/com/yeshi/fanli/entity/bus/user/UserCustomSettings.java |    7 ++-----
 1 files changed, 2 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 026267c..2320cdd 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,13 +6,10 @@
 import org.yeshi.utils.mybatis.Table;
 
 /**
- * 璁㈠崟-绠�鐗�
- * 
- * @author yj
+ * 鐢ㄦ埛app鐣岄潰涓�у寲璁剧疆
+ * @author Administrator
  *
- * @date 2018骞�12鏈�23鏃�
  */
-
 @Table("yeshi_ec_user_custom_settings")
 public class UserCustomSettings {
 

--
Gitblit v1.8.0