From f89184e9312c9d8ba8a57e56f59a4b8f6cc81dc9 Mon Sep 17 00:00:00 2001
From: SliverHorn <503551462@qq.com>
Date: Mon, 26 Oct 2020 18:33:45 +0800
Subject: [PATCH] rename data->date

---
 server/cmd/datas/dictionary_details.go                     | 2 +-
 server/resource/template/fe/table.vue.tpl                  | 2 +-
 web/src/utils/{data.js => date.js}                         | 0
 web/src/view/example/customer/customer.vue                 | 2 +-
 web/src/view/example/upload/upload.vue                     | 2 +-
 web/src/view/superAdmin/dictionary/sysDictionary.vue       | 2 +-
 web/src/view/superAdmin/dictionary/sysDictionaryDetail.vue | 2 +-
 web/src/view/superAdmin/operation/sysOperationRecord.vue   | 2 +-
 8 files changed, 7 insertions(+), 7 deletions(-)
 rename web/src/utils/{data.js => date.js} (100%)

diff --git a/server/cmd/datas/dictionary_details.go b/server/cmd/datas/dictionary_details.go
index a06d6c58..0b596a07 100644
--- a/server/cmd/datas/dictionary_details.go
+++ b/server/cmd/datas/dictionary_details.go
@@ -16,7 +16,7 @@ func InitSysDictionaryDetail(db *gorm.DB) (err error) {
 		{gorm.Model{ID: 2, CreatedAt: time.Now(), UpdatedAt: time.Now()}, "mediumint", 2, status, 2, 2},
 		{gorm.Model{ID: 3, CreatedAt: time.Now(), UpdatedAt: time.Now()}, "int", 3, status, 3, 2},
 		{gorm.Model{ID: 4, CreatedAt: time.Now(), UpdatedAt: time.Now()}, "bigint", 4, status, 4, 2},
-		{gorm.Model{ID: 5, CreatedAt: time.Now(), UpdatedAt: time.Now()}, "data", 0, status, 0, 3},
+		{gorm.Model{ID: 5, CreatedAt: time.Now(), UpdatedAt: time.Now()}, "date", 0, status, 0, 3},
 		{gorm.Model{ID: 6, CreatedAt: time.Now(), UpdatedAt: time.Now()}, "time", 1, status, 1, 3},
 		{gorm.Model{ID: 7, CreatedAt: time.Now(), UpdatedAt: time.Now()}, "year", 2, status, 2, 3},
 		{gorm.Model{ID: 8, CreatedAt: time.Now(), UpdatedAt: time.Now()}, "datetime", 3, status, 3, 3},
diff --git a/server/resource/template/fe/table.vue.tpl b/server/resource/template/fe/table.vue.tpl
index 9a3c5a18..9b2c2b4c 100644
--- a/server/resource/template/fe/table.vue.tpl
+++ b/server/resource/template/fe/table.vue.tpl
@@ -110,7 +110,7 @@ import {
     find{{.StructName}},
     get{{.StructName}}List
 } from "@/api/{{.PackageName}}";  //  此处请自行替换地址
-import { formatTimeToStr } from "@/utils/data";
+import { formatTimeToStr } from "@/utils/date";
 import infoList from "@/components/mixins/infoList";
 
 export default {
diff --git a/web/src/utils/data.js b/web/src/utils/date.js
similarity index 100%
rename from web/src/utils/data.js
rename to web/src/utils/date.js
diff --git a/web/src/view/example/customer/customer.vue b/web/src/view/example/customer/customer.vue
index 66e08ac3..b09ad716 100644
--- a/web/src/view/example/customer/customer.vue
+++ b/web/src/view/example/customer/customer.vue
@@ -74,7 +74,7 @@ import {
   getExaCustomer,
   getExaCustomerList
 } from "@/api/customer";
-import { formatTimeToStr } from "@/utils/data";
+import { formatTimeToStr } from "@/utils/date";
 import infoList from "@/components/mixins/infoList";
 
 export default {
diff --git a/web/src/view/example/upload/upload.vue b/web/src/view/example/upload/upload.vue
index c1dfdec1..1b301e5c 100644
--- a/web/src/view/example/upload/upload.vue
+++ b/web/src/view/example/upload/upload.vue
@@ -85,7 +85,7 @@ import { mapGetters } from "vuex";
 import infoList from "@/components/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 {
diff --git a/web/src/view/superAdmin/dictionary/sysDictionary.vue b/web/src/view/superAdmin/dictionary/sysDictionary.vue
index 48304a94..5fb1d120 100644
--- a/web/src/view/superAdmin/dictionary/sysDictionary.vue
+++ b/web/src/view/superAdmin/dictionary/sysDictionary.vue
@@ -117,7 +117,7 @@ import {
     findSysDictionary,
     getSysDictionaryList
 } from "@/api/sysDictionary";  //  此处请自行替换地址
-import { formatTimeToStr } from "@/utils/data";
+import { formatTimeToStr } from "@/utils/date";
 import infoList from "@/components/mixins/infoList";
 export default {
   name: "SysDictionary",
diff --git a/web/src/view/superAdmin/dictionary/sysDictionaryDetail.vue b/web/src/view/superAdmin/dictionary/sysDictionaryDetail.vue
index 79b6b03f..1215a510 100644
--- a/web/src/view/superAdmin/dictionary/sysDictionaryDetail.vue
+++ b/web/src/view/superAdmin/dictionary/sysDictionaryDetail.vue
@@ -114,7 +114,7 @@ import {
   findSysDictionaryDetail,
   getSysDictionaryDetailList
 } from "@/api/sysDictionaryDetail"; //  此处请自行替换地址
-import { formatTimeToStr } from "@/utils/data";
+import { formatTimeToStr } from "@/utils/date";
 import infoList from "@/components/mixins/infoList";
 
 export default {
diff --git a/web/src/view/superAdmin/operation/sysOperationRecord.vue b/web/src/view/superAdmin/operation/sysOperationRecord.vue
index d8c8e0cb..9270d8fc 100644
--- a/web/src/view/superAdmin/operation/sysOperationRecord.vue
+++ b/web/src/view/superAdmin/operation/sysOperationRecord.vue
@@ -113,7 +113,7 @@ import {
   getSysOperationRecordList,
   deleteSysOperationRecordByIds
 } from '@/api/sysOperationRecord' //  此处请自行替换地址
-import { formatTimeToStr } from '@/utils/data'
+import { formatTimeToStr } from '@/utils/date'
 import infoList from '@/components/mixins/infoList'
 
 export default {