Merge branch 'score_shop' into api_score_meger

jyy

2021-04-26 ebbe59b6ee3378fa296441cabe8bb81b2bc200b5

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