Merge branch 'master' of http://192.168.1.22:3000/frontend/app-govern

# Conflicts:
#	pages/device/APF/comp/power.vue
#	pages/device/APF/comp/xieBo.vue
#	pages/device/APF/detail.vue
#	pages/device/DVR/detail.vue
#	pages/user/head.vue

pages/device/APF/report.vue

@@ -88,7 +88,7 @@ export default {
     onNavigationBarButtonTap(e) {
         uni.showModal({
             title: '提示',
-            content: '确定要全部标记为已读吗？',
+            content: '确定要全部标记为已读吗1？',
             success: (res) => {
                 if (res.confirm) {
                     updateStatus({