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/merchatCenter/commentManger/commentItem.json |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)

diff --git a/web/unpackage/dist/dev/mp-weixin/pages/merchant/merchatCenter/commentManger/commentItem.json b/web/unpackage/dist/dev/mp-weixin/pages/merchant/merchatCenter/commentManger/commentItem.json
index 4575d1b..7424aa9 100644
--- a/web/unpackage/dist/dev/mp-weixin/pages/merchant/merchatCenter/commentManger/commentItem.json
+++ b/web/unpackage/dist/dev/mp-weixin/pages/merchant/merchatCenter/commentManger/commentItem.json
@@ -1,4 +1,9 @@
 {
+<<<<<<< HEAD
+  "component": true,
+  "usingComponents": {}
+=======
   "usingComponents": {},
   "component": true
+>>>>>>> 4eac422e52a4d28fb651b75d0f054697c7a2c0fa
 }
\ No newline at end of file

--
Gitblit v1.9.3