短信发送

src/main.js

@@ -13,7 +13,6 @@ import router from './router'
 import directive from './directive' // directive
 import plugins from './plugins' // plugins
 import { download } from '@/utils/request'
-<<<<<<< HEAD
 import { Message } from 'element-ui'
 import NProgress from 'nprogress'
 import 'nprogress/nprogress.css'
@@ -23,11 +22,6 @@ import './assets/icons' // icon
 // 引入Iconfont 矢量图标库
 import './assets/icon/iconfont.css'
 // import './permission' // permission control
-=======
-
-import './assets/icon/iconfont.css'
-import './permission' // permission control
->>>>>>> 0ca62df (缴费，案件详情问题处理)
 import { getDicts } from "@/api/system/dict/data";
 import { getConfigKey } from "@/api/system/config";
 import { parseTime, resetForm, addDateRange, selectDictLabel, selectDictLabels, handleTree } from "@/utils/ruoyi";