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/service/impl/push/PushInfoServiceImpl.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/push/PushInfoServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/push/PushInfoServiceImpl.java
index 91ad672..deaf8a9 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/push/PushInfoServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/push/PushInfoServiceImpl.java
@@ -357,7 +357,7 @@
 					case 1: // 绔欏唴淇�
 						pushService.pushZNX(uid, title, content, listIOS, listAndroid);
 						userSystemMsgService.addUserSystemMsg(uid, UserSystemMsgTypeEnum.question, title, content,
-								UserSystemMsg.TIME_TAG_EMERGENT, null);
+								UserSystemMsg.TIME_TAG_COMMON, null);
 						break;
 					case 2: // 缃戦〉鎺ㄩ��
 						pushService.pushUrl(uid, title, content, url, listIOS, listAndroid);

--
Gitblit v1.8.0