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

rk

2 天以前 9cfcd4c424c99f1f9dede58c3bf5aa0166c95381

 pda/App.vue

@@ -8,7 +8,7 @@
      getUserInfo().then(ress => {
        console.log(ress.data)
      })
   },15000);
   },60000 );
  },
  onShow: function () {
    console.log('App Show')