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

yangdelong

2021-05-30 4adfa4774e09f3b388335bb8dee5dea518856e5b

 src/components/panel/topicSearch/EnterpriseEmergencySearch.vue

@@ -13,8 +13,8 @@
</template>

<script>
import EventQuery from './EnterpriseEmergency/EventQuery'
import ResourcesQuery from './EnterpriseEmergency/ResourcesQuery'
import EventQuery from './enterprise-emergency/EventQuery'
import ResourcesQuery from './enterprise-emergency/ResourcesQuery'

export default {
  name: 'EnterpriseEmergencySearch',
@@ -22,7 +22,6 @@
  components: {
    EventQuery,
    ResourcesQuery
    // ReportPopup
  },
  data () {
    return {