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/components/mixins/infoList.js

@@ -1,37 +0,0 @@
-import { getDict } from "@/utils/dictionary";
-export default {
-    data() {
-        return {
-            page: 1,
-            total: 10,
-            pageSize: 10,
-            tableData: [],
-            searchInfo: {}
-        }
-    },
-    methods: {
-        filterDict(value,type){
-          const rowLabel = this[type+"Options"]&&this[type+"Options"].filter(item=>item.value == value)
-          return rowLabel&&rowLabel[0]&&rowLabel[0].label
-        },
-        async getDict(type){
-            const dicts = await getDict(type)
-            this[type+"Options"] = dicts
-        },
-        handleSizeChange(val) {
-            this.pageSize = val
-            this.getTableData()
-        },
-        handleCurrentChange(val) {
-            this.page = val
-            this.getTableData()
-        },
-        async getTableData(page = this.page, pageSize = this.pageSize) {
-            const table = await this.listApi({ page, pageSize, ...this.searchInfo })
-            this.tableData = table.data.list
-            this.total = table.data.total
-            this.page = table.data.page
-            this.pageSize = table.data.pageSize
-        }
-    }
-}