From 8f7460c6ddff45ec39bf2026d75a3f4e2b26f13d Mon Sep 17 00:00:00 2001
From: wzy <wzy19931122ai@163.com>
Date: Thu, 11 Nov 2021 23:01:58 +0800
Subject: [PATCH] fix conflect

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

diff --git a/zq-erp/src/main/resources/templates/views/admin/shop/shopUser-list.html b/zq-erp/src/main/resources/templates/views/admin/shop/shopUser-list.html
index 3678ccb..6011fb9 100644
--- a/zq-erp/src/main/resources/templates/views/admin/shop/shopUser-list.html
+++ b/zq-erp/src/main/resources/templates/views/admin/shop/shopUser-list.html
@@ -145,7 +145,7 @@
         MTools.ininDatetimepicker(".datetimepicker");
         var delUrl="";
         myGrid=MGrid.initGrid({
-            url:basePath+"/admin/sysVipInfo/showList",
+            url:basePath+"/admin/vipInfo/showVipInfoList",
             delUrl:delUrl,
         });
 

--
Gitblit v1.9.1