Merge remote-tracking branch 'origin/api_score_meger' into api_score_meger

jyy

2021-06-19 693f6204a6db2b4b1b80b562fcc1dccc09bb26e7

 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,
        });