Merge branch 'master' of http://git.ycjcjy.com/nanyang/machinery-admin

src/pages/ContentManagementSystem/Advertisement/edit.jsx

@@ -1,11 +1,11 @@
-import { Input, Card, Select, Button, message, InputNumber, Modal } from 'antd';
+import { Input, Card, Select, Button, message, InputNumber } from 'antd';
 import { useEffect, useState } from 'react';
 import { Form } from 'antd';
 import { history } from 'umi';
 import ProCard from '@ant-design/pro-card';
 import { UploadImage } from '@/components/Upload';
 import ExtendContent from '@/components/ExtendContent';
-import { addBanner, updateBanner } from '@/services/ad';
+import { addBanner, updateBanner } from '@/services/banner';
 
 const { Option } = Select;
 const goBack = () => {

src/pages/ContentManagementSystem/Advertisement/index.jsx

@@ -4,7 +4,7 @@ import { Button, Modal, message, Popconfirm } from 'antd';
 import { PlusOutlined } from '@ant-design/icons';
 import { PageHeaderWrapper } from '@ant-design/pro-layout';
 import PageTable from '@/components/PageTable';
-import { getBannerList, deleteBanner } from '@/services/ad';
+import { getBannerList, deleteBanner } from '@/services/banner';
 import moment from 'moment';
 
 const formatterTime = (val) => {