From 52030c16aa8ec31f36f86bb837226f0414a1eed2 Mon Sep 17 00:00:00 2001
From: QM303176530 <303176530@qq.com>
Date: Thu, 29 Oct 2020 22:08:21 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dminxs=E8=B7=AF=E5=BE=84?=
 =?UTF-8?q?=EF=BC=8C=E8=B0=83=E6=95=B4=E5=89=8D=E7=AB=AF=E7=BB=93=E6=9E=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 web/src/view/superAdmin/dictionary/sysDictionaryDetail.vue | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/web/src/view/superAdmin/dictionary/sysDictionaryDetail.vue b/web/src/view/superAdmin/dictionary/sysDictionaryDetail.vue
index 116599bc..87520080 100644
--- a/web/src/view/superAdmin/dictionary/sysDictionaryDetail.vue
+++ b/web/src/view/superAdmin/dictionary/sysDictionaryDetail.vue
@@ -114,13 +114,8 @@ 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",
-- 
GitLab