冲突

Your Name

2022-10-13 902a537974ce0374d68d9e717febab7157a69286

 src/views/specialWorkSystem/flow/ruleofApp/components/approveLevelDialog.vue

File was renamed from src/views/specialWorkSystem/workFlow/approveRule/components/approveLevelDialog.vue
@@ -97,7 +97,7 @@

<script lang="ts">
import { reactive, toRefs, ref, nextTick, onMounted } from 'vue';
import approveItemDialog from '/@/views/specialWorkSystem/workFlow/approveRule/components/approveItemDialog.vue';
import approveItemDialog from '/@/views/specialWorkSystem/flow/ruleofApp/components/approveItemDialog.vue';
import { ElMessage } from 'element-plus/es';
import { safetyActionApi } from '/@/api/specialWorkSystem/safetyAction';
import { approveBasicApi } from '/@/api/specialWorkSystem/approveBasic';