Merge branch 'gin-vue-admin_v2_dev' of https://github.com/piexlmax/gin-vue-admin into gin-vue-admin_v2_dev

# Conflicts:
#	server/model/sys_authority.go
#	server/model/sys_authority_menu.go
#	server/model/sys_base_menu.go

server/model/sys_workflow.go

@@ -28,7 +28,7 @@ type SysWorkflowStepInfo struct {
 // @title    Create
 // @description   create a workflow, 创建工作流
 // @auth                     （2020/04/05  20:22 ）
-// @return                     error
+// @return                    error
 func (wk *SysWorkflow) Create() error {
 	err := global.GVA_DB.Create(&wk).Error
 	return err