From ea9c95c72f7353199c4d3fb182726208c8ab9e42 Mon Sep 17 00:00:00 2001
From: tikkhun <tikkhun@163.com>
Date: Fri, 21 Nov 2025 15:22:42 +0800
Subject: [PATCH] =?UTF-8?q?refactor(Subscription/Orders):=20=E4=BD=BF?=
 =?UTF-8?q?=E7=94=A8=E7=9B=B8=E5=AF=B9=E8=B7=AF=E5=BE=84=E5=AF=BC=E5=85=A5?=
 =?UTF-8?q?OrderDetailDrawer=E7=BB=84=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/Subscription/Orders/index.tsx | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/pages/Subscription/Orders/index.tsx b/src/pages/Subscription/Orders/index.tsx
index 33685c1..69ba61a 100644
--- a/src/pages/Subscription/Orders/index.tsx
+++ b/src/pages/Subscription/Orders/index.tsx
@@ -8,6 +8,7 @@ import { App, Tag, Button } from 'antd';
 import dayjs from 'dayjs';
 import { ordercontrollerGetorders } from '@/servers/api/order';
 import OrderDetailDrawer from './OrderDetailDrawer';
+<<<<<<< HEAD
 import { sitecontrollerAll } from '@/servers/api/site';
 =======
 import { App, Tag, Button, Drawer, List } from 'antd';
@@ -17,6 +18,8 @@ import { App, Tag, Button } from 'antd';
 import dayjs from 'dayjs';
 import { ordercontrollerGetorders } from '@/servers/api/order';
 import OrderDetailDrawer from '@/pages/Order/List/OrderDetailDrawer';
+=======
+>>>>>>> 502cd0c (refactor(Subscription/Orders): 使用相对路径导入OrderDetailDrawer组件)
 import { sitecontrollerAll } from '@/servers/api/site';
 <<<<<<< HEAD
 import { request } from 'umi';