Merge branch 'score_shop' into api_score_meger

wzy

2021-09-04 1a9b054b95eb864d1ae7d90d1dfbb497ca1db62a

 zq-erp/src/main/resources/templates/views/admin/hive/products/shoppinggoods-md-list.html

@@ -151,7 +151,7 @@
        delUrl = basePath + "/admin/shoppinggoods/del";

        myGrid = MGrid.initGrid({
            url: basePath + "/admin/shoppinggoods/showList",
            url: basePath + "/admin/shoppinggoods/showAllList",
            delUrl: delUrl
        });
    });