From 7d069cdc3edf2010ceeec0f85385c2af447e9559 Mon Sep 17 00:00:00 2001
From: chenyao <1219716595@qq.com>
Date: Mon, 10 Mar 2025 14:12:17 +0800
Subject: [PATCH] 配合后端修改前缀
---
src/views/resource/waylineFile.vue | 4 ----
1 files changed, 0 insertions(+), 4 deletions(-)
diff --git a/src/views/resource/waylineFile.vue b/src/views/resource/waylineFile.vue
index 03f65f6..aef1be5 100644
--- a/src/views/resource/waylineFile.vue
+++ b/src/views/resource/waylineFile.vue
@@ -227,10 +227,6 @@
},
},
};
-<<<<<<< HEAD
-
-=======
->>>>>>> 448b6ce06438454ccbc00d953e36df9b8cc617ca
</script>
<style scoped>
--
Gitblit v1.9.3