yvan/Study
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'gva_gormv2_dev' of https://github.com/flipped-aurora/gin-vue-admin into gva_workflow

Browse Source 
 Conflicts:
	server/cmd/datas/apis.go
	server/cmd/datas/menus.go
	server/model/sys_workflow.go
	server/model/sys_workflow_process.go
This commit is contained in:
pixel
2020-10-29 11:41:38 +08:00
parent 0e1a820c3a 10d8d7f28a
commit c570c095b9
36 changed files with 280 additions and 192 deletions
Download Patch File Download Diff File Expand all files Collapse all files
web/src/utils/data.js → web/src/utils/date.js
View File
web/src/view/example/customer/customer.vue
+1 -1
View File
@@ -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 {
web/src/view/example/upload/upload.vue
+1 -1
View File
@@ -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 {
web/src/view/superAdmin/dictionary/sysDictionary.vue
+1 -1
View File
@@ -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",
web/src/view/superAdmin/dictionary/sysDictionaryDetail.vue
+1 -1
View File
@@ -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 {
web/src/view/superAdmin/operation/sysOperationRecord.vue
+1 -1
View File
@@ -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 {