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/merchant/applyMerchant/merchantApproveFail.wxss |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/web/unpackage/dist/dev/mp-weixin/pages/merchant/applyMerchant/merchantApproveFail.wxss b/web/unpackage/dist/dev/mp-weixin/pages/merchant/applyMerchant/merchantApproveFail.wxss
index 03499c5..afc9267 100644
--- a/web/unpackage/dist/dev/mp-weixin/pages/merchant/applyMerchant/merchantApproveFail.wxss
+++ b/web/unpackage/dist/dev/mp-weixin/pages/merchant/applyMerchant/merchantApproveFail.wxss
@@ -1,5 +1,8 @@
 @charset "UTF-8";
+<<<<<<< HEAD
 /* @import '@/uni_modules/uni-scss/variables.scss';*/
+=======
+>>>>>>> 4eac422e52a4d28fb651b75d0f054697c7a2c0fa
 /* 棰滆壊鍙橀噺 */
 .main-container.data-v-678e23c8 {
   text-align: center;

--
Gitblit v1.9.3