refactor(Subscription/Orders): 使用相对路径导入OrderDetailDrawer组件
This commit is contained in:
parent
37e999bef9
commit
ea9c95c72f
|
|
@ -8,6 +8,7 @@ import { App, Tag, Button } from 'antd';
|
||||||
import dayjs from 'dayjs';
|
import dayjs from 'dayjs';
|
||||||
import { ordercontrollerGetorders } from '@/servers/api/order';
|
import { ordercontrollerGetorders } from '@/servers/api/order';
|
||||||
import OrderDetailDrawer from './OrderDetailDrawer';
|
import OrderDetailDrawer from './OrderDetailDrawer';
|
||||||
|
<<<<<<< HEAD
|
||||||
import { sitecontrollerAll } from '@/servers/api/site';
|
import { sitecontrollerAll } from '@/servers/api/site';
|
||||||
=======
|
=======
|
||||||
import { App, Tag, Button, Drawer, List } from 'antd';
|
import { App, Tag, Button, Drawer, List } from 'antd';
|
||||||
|
|
@ -17,6 +18,8 @@ import { App, Tag, Button } from 'antd';
|
||||||
import dayjs from 'dayjs';
|
import dayjs from 'dayjs';
|
||||||
import { ordercontrollerGetorders } from '@/servers/api/order';
|
import { ordercontrollerGetorders } from '@/servers/api/order';
|
||||||
import OrderDetailDrawer from '@/pages/Order/List/OrderDetailDrawer';
|
import OrderDetailDrawer from '@/pages/Order/List/OrderDetailDrawer';
|
||||||
|
=======
|
||||||
|
>>>>>>> 502cd0c (refactor(Subscription/Orders): 使用相对路径导入OrderDetailDrawer组件)
|
||||||
import { sitecontrollerAll } from '@/servers/api/site';
|
import { sitecontrollerAll } from '@/servers/api/site';
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
import { request } from 'umi';
|
import { request } from 'umi';
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue