yujinwen 5 days ago
parent
commit
9c3530127b
1 changed files with 0 additions and 4 deletions
  1. 0 4
      src/views/report/PreviewDetail.vue

+ 0 - 4
src/views/report/PreviewDetail.vue

@@ -39,10 +39,6 @@ function formatSmartStyle() {
     })
 }
 
-<<<<<<< HEAD
-
-=======
->>>>>>> yb11.1
 const configStore = useConfigSettingStore()
 const { etaConfigInfo } = storeToRefs(configStore)
     //获取基本配置,判断是否走审批流