From 5c4ecf9e8b47efbbf5d21c9e109be0a60cb7e26d Mon Sep 17 00:00:00 2001
From: yujian <yujian>
Date: 星期一, 08 四月 2019 15:15:09 +0800
Subject: [PATCH] 冲突解决
---
fanli/src/main/java/com/yeshi/fanli/entity/bus/msg/UserSystemMsg.java | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/entity/bus/msg/UserSystemMsg.java b/fanli/src/main/java/com/yeshi/fanli/entity/bus/msg/UserSystemMsg.java
index f3975d2..a97989c 100644
--- a/fanli/src/main/java/com/yeshi/fanli/entity/bus/msg/UserSystemMsg.java
+++ b/fanli/src/main/java/com/yeshi/fanli/entity/bus/msg/UserSystemMsg.java
@@ -15,7 +15,7 @@
* @author Administrator
*
*/
-@Table("yeshi_ec_msg_system")
+@Table("yeshi_ec_user_msg_system")
public class UserSystemMsg {
public final static int TIME_TAG_COMMON = 0;// 鏅��
public final static int TIME_TAG_EMERGENT = 1;// 绱ф��
--
Gitblit v1.8.0