Merge branch 'api' into score_shop

Helius

2021-04-08 4eda876fabd7478e337041d7b9c7db771678fac5

 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/bizUser/showList",
            url:basePath+"/admin/sysVipInfo/showList",
            delUrl:delUrl,
        });