From c41e8d372cdabbe1fd5973c9322e38a40bfa1a39 Mon Sep 17 00:00:00 2001
From: 姜友瑶 <935090232@qq.com>
Date: Thu, 05 May 2022 15:50:07 +0800
Subject: [PATCH] Merge branch 'developer' into alpha

---
 zq-erp/src/main/resources/templates/views/admin/hive/products/shoppinggoods-md-list.html |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/zq-erp/src/main/resources/templates/views/admin/hive/products/shoppinggoods-md-list.html b/zq-erp/src/main/resources/templates/views/admin/hive/products/shoppinggoods-md-list.html
index 77b6bba..9efa91b 100644
--- a/zq-erp/src/main/resources/templates/views/admin/hive/products/shoppinggoods-md-list.html
+++ b/zq-erp/src/main/resources/templates/views/admin/hive/products/shoppinggoods-md-list.html
@@ -151,7 +151,7 @@
         delUrl = basePath + "/admin/shoppinggoods/del";
 
         myGrid = MGrid.initGrid({
-            url: basePath + "/admin/shoppinggoods/showList",
+            url: basePath + "/admin/shoppinggoods/showAllList",
             delUrl: delUrl
         });
     });

--
Gitblit v1.9.1