Merge branch 'zz-test' into master

app/src/views/BasicInfo/index.vue

@@ -28,7 +28,7 @@
           <border-panel
             height="270px"
             width="468px"
-            title="历史火宅"
+            title="历史火灾"
             :headerType="2"
             style="margin-right: 8px;"
           >