From 5d94d50b94213cabf3e94182cc03bc65f53cb56a Mon Sep 17 00:00:00 2001
From: jishenghua <752718920@qq.com>
Date: Tue, 26 Dec 2023 00:02:01 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=8A=A5=E8=A1=A8=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E6=8E=A5=E5=8F=A3=EF=BC=8C=E5=A2=9E=E5=8A=A0=E6=8E=92?=
 =?UTF-8?q?=E5=BA=8F=E5=AD=97=E6=AE=B5=E7=9A=84=E9=BB=98=E8=AE=A4=E5=80=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/jsh/erp/controller/MaterialController.java  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/jshERP-boot/src/main/java/com/jsh/erp/controller/MaterialController.java b/jshERP-boot/src/main/java/com/jsh/erp/controller/MaterialController.java
index f288b5f13..69291fb9d 100644
--- a/jshERP-boot/src/main/java/com/jsh/erp/controller/MaterialController.java
+++ b/jshERP-boot/src/main/java/com/jsh/erp/controller/MaterialController.java
@@ -595,8 +595,8 @@ public class MaterialController {
                                              @RequestParam(value = "position", required = false) String position,
                                              @RequestParam("materialParam") String materialParam,
                                              @RequestParam("zeroStock") Integer zeroStock,
-                                             @RequestParam(value = "column", required = false) String column,
-                                             @RequestParam(value = "order", required = false) String order,
+                                             @RequestParam(value = "column", required = false, defaultValue = "createTime") String column,
+                                             @RequestParam(value = "order", required = false, defaultValue = "desc") String order,
                                              HttpServletRequest request)throws Exception {
         BaseResponseInfo res = new BaseResponseInfo();
         Map<String, Object> map = new HashMap<>();