diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/quartz/controller/QuartzJobController.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/quartz/controller/QuartzJobController.java
index e085d650..b597c85f 100644
--- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/quartz/controller/QuartzJobController.java
+++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/quartz/controller/QuartzJobController.java
@@ -9,6 +9,7 @@ import java.util.Map;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
+import com.jero.common.system.base.controller.JeroController;
 import org.apache.poi.ss.formula.functions.T;
 import org.apache.shiro.authz.annotation.RequiresRoles;
 import com.jero.common.api.vo.Result;
@@ -27,12 +28,7 @@ import org.quartz.JobKey;
 import org.quartz.Scheduler;
 import org.quartz.SchedulerException;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 import org.springframework.web.multipart.MultipartHttpServletRequest;
 import org.springframework.web.servlet.ModelAndView;
@@ -72,10 +68,11 @@ public class QuartzJobController {
 	 * @return
 	 */
 	@RequestMapping(value = "/page", method = RequestMethod.GET)
+	@GetMapping("/page")
 	public Result<IPage<QuartzJob>> queryPageList(QuartzJob quartzJob, @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
 								   @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, HttpServletRequest req) {
 		QueryWrapper<QuartzJob> queryWrapper = QueryGenerator.initQueryWrapper(quartzJob, req.getParameterMap());
-		Page<QuartzJob> page = new Page<QuartzJob>(pageNo, pageSize);
+		Page<QuartzJob> page = new Page<>(pageNo, pageSize);
 		IPage<QuartzJob> pageList = quartzJobService.page(page, queryWrapper);
         return Result.OK(pageList);
 
@@ -88,7 +85,8 @@ public class QuartzJobController {
 	 * @return
 	 */
 	//@RequiresRoles("admin")
-	@RequestMapping(value = "/add", method = RequestMethod.POST)
+//	@RequestMapping(value = "/add", method = RequestMethod.POST)
+	@PostMapping("/add")
 	public Result<T> add(@RequestBody QuartzJob quartzJob) {
 		quartzJobService.saveAndScheduleJob(quartzJob);
 		return Result.OK("创建定时任务成功");
@@ -101,7 +99,8 @@ public class QuartzJobController {
 	 * @return
 	 */
 	//@RequiresRoles("admin")
-	@RequestMapping(value = "/edit", method = RequestMethod.PUT)
+//	@RequestMapping(value = "/edit", method = RequestMethod.PUT)
+	@PutMapping("/edit")
 	public Result<T> eidt(@RequestBody QuartzJob quartzJob) {
 		try {
 			quartzJobService.editAndScheduleJob(quartzJob);
@@ -120,6 +119,7 @@ public class QuartzJobController {
 	 */
 	//@RequiresRoles("admin")
 	@RequestMapping(value = "/delete", method = RequestMethod.DELETE)
+	@DeleteMapping("/delete")
 	public Result<T> delete(@RequestParam(name = "id", required = true) String id) {
 		QuartzJob quartzJob = quartzJobService.getById(id);
 		if (quartzJob == null) {
@@ -137,7 +137,8 @@ public class QuartzJobController {
 	 * @return
 	 */
 	//@RequiresRoles("admin")
-	@RequestMapping(value = "/deleteBatch", method = RequestMethod.DELETE)
+//	@RequestMapping(value = "/deleteBatch", method = RequestMethod.DELETE)
+	@DeleteMapping("/deleteBatch")
 	public Result<T> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
 		if (ids == null || "".equals(ids.trim())) {
 			return Result.error("参数不识别！");
@@ -191,7 +192,8 @@ public class QuartzJobController {
 	 * @param id
 	 * @return
 	 */
-	@RequestMapping(value = "/queryById", method = RequestMethod.GET)
+//	@RequestMapping(value = "/queryById", method = RequestMethod.GET)
+	@GetMapping("/queryById")
 	public Result<QuartzJob> queryById(@RequestParam(name = "id", required = true) String id) {
 		QuartzJob quartzJob = quartzJobService.getById(id);
         return Result.OK(quartzJob);
@@ -211,9 +213,9 @@ public class QuartzJobController {
 		ModelAndView mv = new ModelAndView(new JeecgEntityExcelView());
 		List<QuartzJob> pageList = quartzJobService.list(queryWrapper);
 		// 导出文件名称
-		mv.addObject(NormalExcelConstants.FILE_NAME, "定时任务列表");
-		mv.addObject(NormalExcelConstants.CLASS, QuartzJob.class);
-		mv.addObject(NormalExcelConstants.PARAMS, new ExportParams("定时任务列表数据", "导出人:Jero", "导出信息"));
+		mv.addObject(JeroController.FILE_NAME, "定时任务列表");
+		mv.addObject(JeroController.CLASS, QuartzJob.class);
+		mv.addObject(JeroController.PARAMS, new ExportParams("定时任务列表数据", "导出人:Jero", "导出信息"));
 		mv.addObject(NormalExcelConstants.DATA_LIST, pageList);
 		return mv;
 	}
@@ -225,13 +227,15 @@ public class QuartzJobController {
 	 * @param response
 	 * @return
 	 */
-	@RequestMapping(value = "/importExcel", method = RequestMethod.POST)
+//	@RequestMapping(value = "/importExcel", method = RequestMethod.POST)
+	@PostMapping("/importExcel")
 	public Result<T> importExcel(HttpServletRequest request, HttpServletResponse response) throws IOException {
 		MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest) request;
 		Map<String, MultipartFile> fileMap = multipartRequest.getFileMap();
 		// 错误信息
 		List<String> errorMessage = new ArrayList<>();
-		int successLines = 0, errorLines = 0;
+		int successLines = 0;
+		int errorLines = 0;
 		for (Map.Entry<String, MultipartFile> entity : fileMap.entrySet()) {
 			MultipartFile file = entity.getValue();// 获取上传文件对象
 			ImportParams params = new ImportParams();