diff --git a/jero-boot/jero-boot-module-demo/src/main/java/com/jero/modules/demo/test/controller/JeroOrderMainController.java b/jero-boot/jero-boot-module-demo/src/main/java/com/jero/modules/demo/test/controller/JeroOrderMainController.java
index 0feb4503..2f5fbdac 100644
--- a/jero-boot/jero-boot-module-demo/src/main/java/com/jero/modules/demo/test/controller/JeroOrderMainController.java
+++ b/jero-boot/jero-boot-module-demo/src/main/java/com/jero/modules/demo/test/controller/JeroOrderMainController.java
@@ -74,9 +74,9 @@ public class JeroOrderMainController extends JeroController<JeroOrderMain, IJero
      * @return
      */
     @GetMapping(value = "/list")
-    public Result<?> queryPageList(JeroOrderMain jeroOrderMain, @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, HttpServletRequest req) {
+    public Result queryPageList(JeroOrderMain jeroOrderMain, @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, HttpServletRequest req) {
         QueryWrapper<JeroOrderMain> queryWrapper = QueryGenerator.initQueryWrapper(jeroOrderMain, req.getParameterMap());
-        Page<JeroOrderMain> page = new Page<JeroOrderMain>(pageNo, pageSize);
+        Page<JeroOrderMain> page = new Page<>(pageNo, pageSize);
         IPage<JeroOrderMain> pageList = jeroOrderMainService.page(page, queryWrapper);
         return Result.OK(pageList);
     }
@@ -88,7 +88,7 @@ public class JeroOrderMainController extends JeroController<JeroOrderMain, IJero
      * @return
      */
     @PostMapping(value = "/add")
-    public Result<?> add(@RequestBody JeroOrderMainPage jeroOrderMainPage) {
+    public Result add(@RequestBody JeroOrderMainPage jeroOrderMainPage) {
         JeroOrderMain jeroOrderMain = new JeroOrderMain();
         BeanUtils.copyProperties(jeroOrderMainPage, jeroOrderMain);
         jeroOrderMainService.saveMain(jeroOrderMain, jeroOrderMainPage.getJeroOrderCustomerList(), jeroOrderMainPage.getJeroOrderTicketList());
@@ -102,7 +102,7 @@ public class JeroOrderMainController extends JeroController<JeroOrderMain, IJero
      * @return
      */
     @PutMapping(value = "/edit")
-    public Result<?> eidt(@RequestBody JeroOrderMainPage jeroOrderMainPage) {
+    public Result eidt(@RequestBody JeroOrderMainPage jeroOrderMainPage) {
         JeroOrderMain jeroOrderMain = new JeroOrderMain();
         BeanUtils.copyProperties(jeroOrderMainPage, jeroOrderMain);
         jeroOrderMainService.updateCopyMain(jeroOrderMain, jeroOrderMainPage.getJeroOrderCustomerList(), jeroOrderMainPage.getJeroOrderTicketList());
@@ -116,7 +116,7 @@ public class JeroOrderMainController extends JeroController<JeroOrderMain, IJero
      * @return
      */
     @DeleteMapping(value = "/delete")
-    public Result<?> delete(@RequestParam(name = "id", required = true) String id) {
+    public Result delete(@RequestParam(name = "id", required = true) String id) {
         jeroOrderMainService.delMain(id);
         return Result.OK("删除成功!");
     }
@@ -128,7 +128,7 @@ public class JeroOrderMainController extends JeroController<JeroOrderMain, IJero
      * @return
      */
     @DeleteMapping(value = "/deleteBatch")
-    public Result<?> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
+    public Result deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
         this.jeroOrderMainService.delBatchMain(Arrays.asList(ids.split(",")));
         return Result.OK("批量删除成功!");
     }
@@ -140,7 +140,7 @@ public class JeroOrderMainController extends JeroController<JeroOrderMain, IJero
      * @return
      */
     @GetMapping(value = "/queryById")
-    public Result<?> queryById(@RequestParam(name = "id", required = true) String id) {
+    public Result queryById(@RequestParam(name = "id", required = true) String id) {
         JeroOrderMain jeroOrderMain = jeroOrderMainService.getById(id);
         return Result.OK(jeroOrderMain);
     }
@@ -152,7 +152,7 @@ public class JeroOrderMainController extends JeroController<JeroOrderMain, IJero
      * @return
      */
     @GetMapping(value = "/queryOrderCustomerListByMainId")
-    public Result<?> queryOrderCustomerListByMainId(@RequestParam(name = "id", required = true) String id) {
+    public Result queryOrderCustomerListByMainId(@RequestParam(name = "id", required = true) String id) {
         List<JeroOrderCustomer> jeroOrderCustomerList = jeroOrderCustomerService.selectCustomersByMainId(id);
         return Result.OK(jeroOrderCustomerList);
     }
@@ -164,7 +164,7 @@ public class JeroOrderMainController extends JeroController<JeroOrderMain, IJero
      * @return
      */
     @GetMapping(value = "/queryOrderTicketListByMainId")
-    public Result<?> queryOrderTicketListByMainId(@RequestParam(name = "id", required = true) String id) {
+    public Result queryOrderTicketListByMainId(@RequestParam(name = "id", required = true) String id) {
         List<JeroOrderTicket> jeroOrderTicketList = jeroOrderTicketService.selectTicketsByMainId(id);
         return Result.OK(jeroOrderTicketList);
     }
@@ -183,7 +183,7 @@ public class JeroOrderMainController extends JeroController<JeroOrderMain, IJero
         //获取当前用户
         LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
 
-        List<JeroOrderMainPage> pageList = new ArrayList<JeroOrderMainPage>();
+        List<JeroOrderMainPage> pageList = new ArrayList<>();
 
         List<JeroOrderMain> jeroOrderMainList = jeroOrderMainService.list(queryWrapper);
         for (JeroOrderMain orderMain : jeroOrderMainList) {
@@ -199,11 +199,11 @@ public class JeroOrderMainController extends JeroController<JeroOrderMain, IJero
         }
 
         // 导出文件名称
-        mv.addObject(NormalExcelConstants.FILE_NAME, "一对多订单示例");
+        mv.addObject(FILE_NAME, "一对多订单示例");
         // 注解对象Class
-        mv.addObject(NormalExcelConstants.CLASS, JeroOrderMainPage.class);
+        mv.addObject(CLASS, JeroOrderMainPage.class);
         // 自定义表格参数
-        mv.addObject(NormalExcelConstants.PARAMS, new ExportParams("自定义导出Excel内容标题", "导出人:" + sysUser.getRealname(), "自定义Sheet名字"));
+        mv.addObject(PARAMS, new ExportParams("自定义导出Excel内容标题", "导出人:" + sysUser.getRealname(), "自定义Sheet名字"));
         // 导出数据列表
         mv.addObject(NormalExcelConstants.DATA_LIST, pageList);
         return mv;
@@ -217,7 +217,7 @@ public class JeroOrderMainController extends JeroController<JeroOrderMain, IJero
      * @return
      */
     @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
-    public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
+    public Result importExcel(HttpServletRequest request, HttpServletResponse response) {
         MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest) request;
         Map<String, MultipartFile> fileMap = multipartRequest.getFileMap();
         for (Map.Entry<String, MultipartFile> entity : fileMap.entrySet()) {