From 25cc716bd7c5968aa11d6c9aaef6e0cd724b86ad Mon Sep 17 00:00:00 2001
From: Mr.Zhang <710666463@qq.com>
Date: 星期五, 01 九月 2023 11:56:00 +0800
Subject: [PATCH] 冲突
---
minipro_standard/App.vue | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/minipro_standard/App.vue b/minipro_standard/App.vue
index d52fd35..def0339 100644
--- a/minipro_standard/App.vue
+++ b/minipro_standard/App.vue
@@ -15,6 +15,7 @@
/*姣忎釜椤甸潰鍏叡css */
@import "@/uni_modules/uview-ui/index.scss";
@import "common/css/lib.css";
+ @import "common/css/common.css";
// page {
// background-color: #F3F6F9 !important;
// }
--
Gitblit v1.9.3