diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/pom.xml b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/pom.xml
index 55819a13..a7fae661 100644
--- a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/pom.xml
+++ b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/pom.xml
@@ -162,8 +162,10 @@
                 jinshui
                 jinshui@833066
 
-                true
+                false
                 47.104.224.45:8848
+                
+                
             
         
 
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 1c900fc7..db2a4ded 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
@@ -385,6 +385,10 @@ public class ActInfoServiceImpl extends BaseServiceImpl= actInfoEntity.getActQuota()) {
+                return ActUserStatusConstant.FULL_SIGN_UP;
+            }
             // (报名审核未通过或者已经取消报名的)可再次报名-我要报名
             if (ActUserRelationStatusConstant.NOT_APPROVED.equals(actUserStatus) || ActUserRelationStatusConstant.CANCEL_SIGN_UP.equals(actUserStatus)) {
                 return ActUserStatusConstant.SIGN_UP;
diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/impl/ActUserRelationServiceImpl.java b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/impl/ActUserRelationServiceImpl.java
index 227bb14f..0bc38b03 100644
--- a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/impl/ActUserRelationServiceImpl.java
+++ b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/impl/ActUserRelationServiceImpl.java
@@ -48,6 +48,7 @@ import com.elink.esua.epdc.dto.epdc.form.EpdcUserPointsFormDTO;
 import com.elink.esua.epdc.modules.activity.dao.ActInfoDao;
 import com.elink.esua.epdc.modules.activity.dao.ActUserLogDao;
 import com.elink.esua.epdc.modules.activity.dao.ActUserRelationDao;
+import com.elink.esua.epdc.modules.activity.entity.ActInfoEntity;
 import com.elink.esua.epdc.modules.activity.entity.ActUserLogEntity;
 import com.elink.esua.epdc.modules.activity.entity.ActUserPointsLogEntity;
 import com.elink.esua.epdc.modules.activity.entity.ActUserRelationEntity;
@@ -473,6 +474,13 @@ public class ActUserRelationServiceImpl extends BaseServiceImpl