From f325e58c5a08910e081698e702a6baf3ce00db54 Mon Sep 17 00:00:00 2001
From: Your Name <123456>
Date: 星期四, 08 九月 2022 16:58:14 +0800
Subject: [PATCH] 冲突

---
 src/views/accidentManagementSystem/accidentExpress/index.vue |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/views/accidentManagementSystem/accidentExpress/index.vue b/src/views/accidentManagementSystem/accidentExpress/index.vue
index fd8d2fc..b6e134b 100644
--- a/src/views/accidentManagementSystem/accidentExpress/index.vue
+++ b/src/views/accidentManagementSystem/accidentExpress/index.vue
@@ -356,4 +356,4 @@
 	min-width: 30px;
 	border-radius: 2px;
 }
-</style>
+</style>
\ No newline at end of file

--
Gitblit v1.9.2