fix conflect

wzy

2021-11-11 8f7460c6ddff45ec39bf2026d75a3f4e2b26f13d

 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 () {