From 70bf5f310d85c3a0700d75a7a877f5a1e403d83f Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期四, 28 三月 2024 09:09:51 +0800
Subject: [PATCH] 合并冲突

---
 src/components/view/enums.vue |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/components/view/enums.vue b/src/components/view/enums.vue
index 82eddd5..b00c5a2 100644
--- a/src/components/view/enums.vue
+++ b/src/components/view/enums.vue
@@ -153,4 +153,4 @@
 			}
 		}
 	}
-</script>
\ No newline at end of file
+</script>

--
Gitblit v1.9.3