推广部分最后修改

pluss-manage-page/src/main/java/cn/pluss/platform/controller/activityActivate/ActivityActivateController.java

@@ -48,7 +48,7 @@ public class ActivityActivateController extends BaseNoModelController {
 
 	/**
 	 * 引导页
-	 * 
+	 *
 	 * @return
 	 */
 	@RequestMapping(value = "/index", method = RequestMethod.GET)
@@ -64,7 +64,7 @@ public class ActivityActivateController extends BaseNoModelController {
 	@RequestMapping(value = "/queryActivityActivateByPage", method = RequestMethod.POST)
 	@ResponseBody
 	public Map<String, Object> queryActivityActivateByPage(@RequestParam(defaultValue = "1") Integer currPage,
-			String name) {
+														   String name) {
 		Map<String, Object> map = new HashMap<>(16);
 		Map<String, Object> result = new HashMap<>(16);
 		Boolean bol = verifyUserRole();
@@ -182,7 +182,7 @@ public class ActivityActivateController extends BaseNoModelController {
 
 	/**
 	 * 保存对象
-	 * 
+	 *
 	 * @throws IOException
 	 */
 	@RequestMapping(value = "/saveActivityActivate", method = RequestMethod.POST)
@@ -238,7 +238,7 @@ public class ActivityActivateController extends BaseNoModelController {
 
 	/**
 	 * 修改对象
-	 * 
+	 *
 	 * @throws IOException
 	 */
 	@RequestMapping(value = "/updateActivityActivate", method = RequestMethod.POST)
@@ -256,7 +256,7 @@ public class ActivityActivateController extends BaseNoModelController {
 
 	/**
 	 * 删除对象
-	 * 
+	 *
 	 * @throws IOException
 	 */
 	@RequestMapping(value = "/deleteActivityActivate", method = RequestMethod.POST)
@@ -298,5 +298,4 @@ public class ActivityActivateController extends BaseNoModelController {
 		List<MerchantBaseInfo> merchantBaseInfoList = merchantBaseInfoService.queryMerchantBaseInfoList(null);
 		request.setAttribute("merchantBaseInfoList", merchantBaseInfoList);
 	}
-
 }