From 60322c503d201e4d1000e62d8ecf17db4f628e4c Mon Sep 17 00:00:00 2001
From: spring <2396852758@qq.com>
Date: 星期三, 12 三月 2025 15:49:23 +0800
Subject: [PATCH] 合并冲突
---
src/views/performance/staffAttendance/index.vue | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/src/views/performance/staffAttendance/index.vue b/src/views/performance/staffAttendance/index.vue
index e18c940..a0a1c56 100644
--- a/src/views/performance/staffAttendance/index.vue
+++ b/src/views/performance/staffAttendance/index.vue
@@ -6,4 +6,4 @@
export default {};
</script>
-<style></style>
+<style></style>
\ No newline at end of file
--
Gitblit v1.9.3