From 23acc4e7eb8673e918620586b96eae25c3e651b2 Mon Sep 17 00:00:00 2001
From: 935090232@qq.com <ak473600000>
Date: Wed, 06 Oct 2021 19:59:46 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/api_score_meger' into api_score_meger

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

diff --git a/zq-erp/src/main/resources/templates/views/admin/hive/products/shoppinggoods-zb-list.html b/zq-erp/src/main/resources/templates/views/admin/hive/products/shoppinggoods-zb-list.html
index a9e5af4..b15b2d8 100644
--- a/zq-erp/src/main/resources/templates/views/admin/hive/products/shoppinggoods-zb-list.html
+++ b/zq-erp/src/main/resources/templates/views/admin/hive/products/shoppinggoods-zb-list.html
@@ -147,7 +147,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