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

2020-10-29 22:08:08 +08:00
parent e8c6d388f2 7488db81c1
commit 4d4d8e4955
41 changed files with 294 additions and 333 deletions
@@ -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",