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';