From 307960b07d8cb122d9de0c8267b8cb7a63cfc605 Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期一, 09 二月 2026 18:24:25 +0800
Subject: [PATCH] a

---
 web/unpackage/dist/dev/mp-weixin/app.wxss |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/web/unpackage/dist/dev/mp-weixin/app.wxss b/web/unpackage/dist/dev/mp-weixin/app.wxss
index a07298e..58a6543 100644
--- a/web/unpackage/dist/dev/mp-weixin/app.wxss
+++ b/web/unpackage/dist/dev/mp-weixin/app.wxss
@@ -1,3 +1,7 @@
+<<<<<<< HEAD
 
+=======
+@import './common/main.wxss';
+>>>>>>> 4eac422e52a4d28fb651b75d0f054697c7a2c0fa
 
 [data-custom-hidden="true"],[bind-data-custom-hidden="true"]{display: none !important;}
\ No newline at end of file

--
Gitblit v1.9.3