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

yangdelong

2021-05-30 4adfa4774e09f3b388335bb8dee5dea518856e5b

 src/components/base-page/enterprise-emergency/event-handling/res-info/EmergBase.js

@@ -179,11 +179,6 @@
        width: 'auto'
      },
      {
        label: '运行状态',
        prop: 'operationalstatus',
        width: 'auto'
      },
      {
        label: '距离',
        prop: 'distance',
        width: 'auto'