From 4f02f36d60e2fe04e0cdf681bc394a95dc51bf8a Mon Sep 17 00:00:00 2001
From: zhangyongzhangyong <2012005003@qq.coom>
Date: Thu, 30 Jul 2020 09:57:27 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B4=BB=E5=8A=A8=E5=8D=B3=E5=B0=86=E5=BC=80?=
 =?UTF-8?q?=E5=A7=8B=EF=BC=8C=E6=8E=A5=E5=8F=A3=E5=8F=8D=E5=8F=82=E5=86=85?=
 =?UTF-8?q?=E5=AE=B9=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/mapper/ActInfoDao.xml                  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/ActInfoDao.xml b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/ActInfoDao.xml
index 8d89ba7406..75d62f1059 100644
--- a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/ActInfoDao.xml
+++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/ActInfoDao.xml
@@ -316,9 +316,9 @@
             i.ID actId,
             CASE
             WHEN <![CDATA[DATE_SUB(i.ACT_START_TIME, INTERVAL 1 HOUR) <= ]]> NOW() AND <![CDATA[i.ACT_START_TIME > ]]> NOW() THEN
-            CONCAT('您报名的 "',i.TITLE,'" 活动还有',TIMESTAMPDIFF(MINUTE, NOW(), i.ACT_START_TIME),'分钟开始。')
+            '您报名的活动即将开始'
             ELSE
-            CONCAT('正在进行中的活动："',i.TITLE,'"。。。')
+            '活动进行中'
             END title
         FROM act_info i LEFT JOIN act_user_relation r ON i.ID = r.ACT_ID
         WHERE i.DEL_FLAG = '0'