Merge branch 'v3.5' of http://git.ycjcjy.com/zhiyuxing/estateagents into v3.5

src/main/java/com/huiju/estateagents/controller/TaShareActivityController.java

@@ -110,7 +110,7 @@ public class TaShareActivityController extends BaseController {
             Integer cityId = iTaBuildingService.getCityById(taShareActivity.getBuildingId());
             taShareActivity.setCityId(cityId);
             taShareActivity.setOrgId(getOrgId(request));
-            taShareActivity.setStatus(0);
+            taShareActivity.setStatus(1);
             taShareActivity.setActivityStatus(1);
             taShareActivity.setSort(false);
             taShareActivity.setWeight(0);
@@ -224,7 +224,7 @@ public class TaShareActivityController extends BaseController {
         ResponseBean responseBean = new ResponseBean();
         try {
             TaShareActivity taShareActivity = new TaShareActivity();
-            //活动禁用启用 0启动1禁用
+            //活动禁用启用 1启动0禁用
             taShareActivity.setStatus(1);
             //0：进行中 1：未开始 2：已结束
             taShareActivity.setActivityStatus(2);

src/main/java/com/huiju/estateagents/job/JudglActivityTimeJob.java

@@ -55,7 +55,7 @@ public class JudglActivityTimeJob extends BaseController {
     /**
      * 开启定时任务，每天12：30执行
      */
-    @Scheduled(cron = "* 30 00 * * ?")
+    @Scheduled(cron = "* 0/5 ** * * ?")
 //    @Scheduled(cron = "0/5 * * * * ?")
     private void configureTasks() {