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/pages/my/index.wxss | 3 +++
1 files changed, 3 insertions(+), 0 deletions(-)
diff --git a/web/unpackage/dist/dev/mp-weixin/pages/my/index.wxss b/web/unpackage/dist/dev/mp-weixin/pages/my/index.wxss
index dc40060..b9a8493 100644
--- a/web/unpackage/dist/dev/mp-weixin/pages/my/index.wxss
+++ b/web/unpackage/dist/dev/mp-weixin/pages/my/index.wxss
@@ -1,5 +1,8 @@
@charset "UTF-8";
+<<<<<<< HEAD
/* @import '@/uni_modules/uni-scss/variables.scss';*/
+=======
+>>>>>>> 4eac422e52a4d28fb651b75d0f054697c7a2c0fa
/* 棰滆壊鍙橀噺 */
.mine.data-v-4dcceeb0 {
background-color: #f5f5f5;
--
Gitblit v1.9.3