参数错误

watero-rst-web/src/main/java/com/iamberry/rst/controllers/pts/AdminMachineController.java

@@ -3,13 +3,11 @@ package com.iamberry.rst.controllers.pts;
 import com.iamberry.rst.core.page.PageRequest;
 import com.iamberry.rst.core.page.PagedResult;
 import com.iamberry.rst.core.pts.*;
-import com.iamberry.rst.core.sys.SysConfig;
 import com.iamberry.rst.core.tools.QRCJson;
 import com.iamberry.rst.core.tools.QrCodeUtil;
 import com.iamberry.rst.core.tools.WeixinUtil;
 import com.iamberry.rst.faces.pts.*;
 import com.iamberry.rst.faces.sys.SysConfigService;
-import com.iamberry.wechat.tools.DateTimeUtil;
 import com.iamberry.wechat.tools.NameUtils;
 import com.iamberry.wechat.tools.ResponseJson;
 import com.iamberry.wechat.tools.ResultInfo;
@@ -28,7 +26,6 @@ import org.springframework.web.servlet.ModelAndView;
 
 import javax.servlet.ServletContext;
 import javax.servlet.http.HttpServletRequest;
-import javax.xml.crypto.Data;
 import java.text.DecimalFormat;
 import java.text.NumberFormat;
 import java.util.*;
@@ -80,12 +77,12 @@ public class AdminMachineController {
      */
     @RequiresPermissions("machine:select_all:machine")
     @RequestMapping("/_machine_list")
-    public ModelAndView listOrder(
+    public ModelAndView listMachine(
             @RequestParam(value = "pageSize", defaultValue = "10", required = false) Integer pageSize,
             @RequestParam(value = "pageNO", defaultValue = "1", required = false) Integer pageNO,
             @RequestParam(value = "pageTotal", required = false) Integer pageTotal,
             PtsMachine ptsMachine) {
-        ModelAndView mv = new ModelAndView("pts/machine/machine_list");
+        ModelAndView mv = new ModelAndView("machine_list");
         StringBuilder sb = new StringBuilder("/admin/machine/_machine_list?pageSize=" + pageSize);
 
         if (StringUtils.isNotEmpty(ptsMachine.getMachineBarcode())) {