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

XingChuan

2021-05-30 2d5e75bbc04d8c4c5c7dc6bb141ad16ffa2d9936

 src/components/base-page/enterprise-emergency/discard/PositionChange.vue

File was renamed from src/components/base-page/enterprise-emergency/PositionChange.vue
@@ -99,8 +99,7 @@
</template>

<script>
import eventBus from '../../../eventBus'

import eventBus from '../../../../eventBus'
export default {
  name: 'PositionChange',
  props: ['location'],