修复mixins路径，调整目录结构

web/src/api/user.js

@@ -110,4 +110,4 @@ export const setUserInfo = (data) => {
         method: 'put',
         data: data
     })
-}
+}

web/src/view/example/upload/upload.vue

@@ -85,7 +85,7 @@ import { mapGetters } from "vuex";
 import infoList from "@/mixins/infoList";
 import { getFileList, deleteFile } from "@/api/fileUploadAndDownload";
 import { downloadImage } from "@/utils/downloadImg";
-import { formatTimeToStr } from "@/utils/data";
+import { formatTimeToStr } from "@/utils/date";
 import CustomPic from "@/components/customPic";
 import UploadImage from "@/components/upload/image.vue";
 export default {

web/src/view/superAdmin/dictionary/sysDictionaryDetail.vue

@@ -114,8 +114,13 @@ import {
   findSysDictionaryDetail,
   getSysDictionaryDetailList
 } from "@/api/sysDictionaryDetail"; //  此处请自行替换地址
+<<<<<<< HEAD
 import { formatTimeToStr } from "@/utils/data";
 import infoList from "@/mixins/infoList";
+=======
+import { formatTimeToStr } from "@/utils/date";
+import infoList from "@/components/mixins/infoList";
+>>>>>>> 439ffe64d529496a87535ed9ec234002c41b4f09
 
 export default {
   name: "SysDictionaryDetail",