Merge branches 'gva_gormv2_dev', 'gva_workflow' and 'master' of https://github.com/flipped-aurora/gin-vue-admin into gva_workflow

 Conflicts:

	server/cmd/datas/init.go

web/src/view/example/customer/customer.vue

@@ -75,7 +75,7 @@ import {
   getExaCustomerList
 } from "@/api/customer";
 import { formatTimeToStr } from "@/utils/date";
-import infoList from "@/components/mixins/infoList";
+import infoList from "@/mixins/infoList";
 
 export default {
   name: "Customer",

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

@@ -82,7 +82,7 @@
 <script>
 const path = process.env.VUE_APP_BASE_API;
 import { mapGetters } from "vuex";
-import infoList from "@/components/mixins/infoList";
+import infoList from "@/mixins/infoList";
 import { getFileList, deleteFile } from "@/api/fileUploadAndDownload";
 import { downloadImage } from "@/utils/downloadImg";
 import { formatTimeToStr } from "@/utils/date";

web/src/view/superAdmin/api/api.vue

@@ -109,7 +109,7 @@ import {
   updateApi,
   deleteApi
 } from '@/api/api'
-import infoList from '@/components/mixins/infoList'
+import infoList from '@/mixins/infoList'
 import { toSQLLine } from '@/utils/stringFun'
 const methodOptions = [
   {

web/src/view/superAdmin/authority/authority.vue

@@ -100,7 +100,7 @@ import Menus from "@/view/superAdmin/authority/components/menus";
 import Apis from "@/view/superAdmin/authority/components/apis";
 import Datas from "@/view/superAdmin/authority/components/datas";
 
-import infoList from "@/components/mixins/infoList";
+import infoList from "@/mixins/infoList";
 export default {
   name: "Authority",
   mixins: [infoList],

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

@@ -118,7 +118,7 @@ import {
     getSysDictionaryList
 } from "@/api/sysDictionary";  //  此处请自行替换地址
 import { formatTimeToStr } from "@/utils/date";
-import infoList from "@/components/mixins/infoList";
+import infoList from "@/mixins/infoList";
 export default {
   name: "SysDictionary",
   mixins: [infoList],

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

@@ -115,7 +115,7 @@ import {
   getSysDictionaryDetailList
 } from "@/api/sysDictionaryDetail"; //  此处请自行替换地址
 import { formatTimeToStr } from "@/utils/date";
-import infoList from "@/components/mixins/infoList";
+import infoList from "@/mixins/infoList";
 
 export default {
   name: "SysDictionaryDetail",

web/src/view/superAdmin/menu/menu.vue

@@ -181,7 +181,7 @@ import {
   deleteBaseMenu,
   getBaseMenuById
 } from "@/api/menu";
-import infoList from "@/components/mixins/infoList";
+import infoList from "@/mixins/infoList";
 import icon from "@/view/superAdmin/menu/icon";
 export default {
   name: "Menus",

web/src/view/superAdmin/operation/sysOperationRecord.vue

@@ -114,7 +114,7 @@ import {
   deleteSysOperationRecordByIds
 } from '@/api/sysOperationRecord' //  此处请自行替换地址
 import { formatTimeToStr } from '@/utils/date'
-import infoList from '@/components/mixins/infoList'
+import infoList from '@/mixins/infoList'
 
 export default {
   name: 'SysOperationRecord',

web/src/view/superAdmin/user/user.vue

@@ -98,7 +98,7 @@ import {
   deleteUser
 } from "@/api/user";
 import { getAuthorityList } from "@/api/authority";
-import infoList from "@/components/mixins/infoList";
+import infoList from "@/mixins/infoList";
 import { mapGetters } from "vuex";
 import CustomPic from "@/components/customPic";
 import ChooseImg from "@/components/chooseImg";