Merge remote-tracking branch 'origin/api' into api

jyy

2021-01-16 522f32b832e47a1e0cb01b0b495d16ada34366a6

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