Merge remote-tracking branch 'origin/master'

yujian

2019-05-23 31a566a0f1e2d69662dfcbce8a1418c3cbe42ad3

 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;// 紧急