From 7ebd4cebbdec2173fba7345285c0ed6d62043995 Mon Sep 17 00:00:00 2001
From: litian <C21AF165>
Date: 星期四, 29 二月 2024 19:27:33 +0800
Subject: [PATCH] 冲突

---
 pages/personalCenter/myOrder/index.wxml |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)

diff --git a/pages/personalCenter/myOrder/index.wxml b/pages/personalCenter/myOrder/index.wxml
index 23977d1..a4252b2 100644
--- a/pages/personalCenter/myOrder/index.wxml
+++ b/pages/personalCenter/myOrder/index.wxml
@@ -1,6 +1,11 @@
 <<<<<<< HEAD
+<<<<<<< HEAD
 <text>鎴戠殑璁㈠崟</text>
 =======
 <!--pages/personalCenter/myOrder/index.wxml-->
 <text>pages/personalCenter/myOrder/index.wxml</text>
 >>>>>>> master
+=======
+<!--pages/personalCenter/myOrder/index.wxml-->
+<text>pages/personalCenter/myOrder/index.wxml</text>
+>>>>>>> master

--
Gitblit v1.9.1