Merge branch 'score_shop' into api_score_meger

jyy

2021-09-11 e1cc4a8ac8250d8f76d4d85f49b2b00a4047f0c9

 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/vipInfo/showVipInfoList",
            delUrl:delUrl,
        });