Merge branch 'score_shop' into api_score_meger

jyy

2021-07-10 8ee9b79c7124bd8a1d25b7a49b77df5b1956d21b

 zq-erp/src/main/resources/templates/views/admin/welcome.html

@@ -209,7 +209,7 @@
            seviceNum: 0,
            orderNum: 0,
            onlineNum:0,
            autoFlash:true,//是否开启自动刷新
            autoFlash:false,//是否开启自动刷新

        },
        created: function () {