From 4ce09d7a2d8089deae9d5fb52d9c7c1c710de1c0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B2=E6=A0=91=E9=80=9A?= <1976590620@qq.com>
Date: Wed, 1 Apr 2020 16:44:15 +0800
Subject: [PATCH] =?UTF-8?q?PC=E7=AB=AF=E5=8F=96=E6=B6=88=E6=B4=BB=E5=8A=A8?=
 =?UTF-8?q?=EF=BC=8C=E5=BA=94=E8=AF=A5=E6=98=AF=E5=9C=A8=E6=B4=BB=E5=8A=A8?=
 =?UTF-8?q?=E5=BC=80=E5=A7=8B=E5=90=8E=E4=B8=8D=E5=85=81=E8=AE=B8=E5=8F=96?=
 =?UTF-8?q?=E6=B6=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/activity/service/impl/ActInfoServiceImpl.java     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/impl/ActInfoServiceImpl.java b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/impl/ActInfoServiceImpl.java
index ca69888da..86a05a776 100644
--- a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/impl/ActInfoServiceImpl.java
+++ b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/impl/ActInfoServiceImpl.java
@@ -184,8 +184,8 @@ public class ActInfoServiceImpl extends BaseServiceImpl<ActInfoDao, ActInfoEntit
         ActInfoEntity entity = baseDao.selectById(dto.getId());
         if (ActStateConstant.ACT_INFO_STATUS_UNDERCARRIAGE.equals(entity.getActStatus())) {
             return new Result().error("活动已取消");
-        } else if (new Date().compareTo(entity.getSignupEndTime()) > 0) {
-            return new Result().error("已过报名时间不可取消");
+        } else if (new Date().compareTo(entity.getActStartTime()) > 0) {
+            return new Result().error("已过活动开始时间不可取消");
         }
         ActInfoEntity updateEntity = new ActInfoEntity();
         updateEntity.setId(dto.getId());