Merge remote-tracking branch 'origin/master'

mec-web/src/main/java/com/ym/mec/web/controller/TenantEntryActivitiesController.java

@@ -3,6 +3,8 @@ package com.ym.mec.web.controller;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 
+import java.util.Date;
+
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -46,4 +48,18 @@ public class TenantEntryActivitiesController extends BaseController {
 		return succeed();
 	}
 
+	@ApiOperation(value = "停用、启用")
+	@PostMapping("/updateDelFlag")
+	@PreAuthorize("@pcs.hasPermissions('tenantEntryActivities/updateDelFlag')")
+	public Object updateDelFlag(int id, boolean delFlag) {
+		TenantEntryActivities tenantEntryActivities = tenantEntryActivitiesService.get(id);
+		if (tenantEntryActivities == null) {
+			return failed("活动不存在");
+		}
+		tenantEntryActivities.setDelFlag(delFlag);
+		tenantEntryActivities.setUpdateTime(new Date());
+		tenantEntryActivitiesService.merge(tenantEntryActivities);
+		return succeed();
+	}
+
 }