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

server/cmd/datas/menus.go

@@ -48,7 +48,7 @@ func InitSysBaseMenus(db *gorm.DB) (err error) {
 			color.Danger.Println("sys_base_menus表的初始数据已存在!")
 			return nil
 		}
-		if tx.Create(&BaseMenus).Error != nil { // 遇到错误时回滚事务
+		if err := tx.Create(&BaseMenus).Error; err != nil { // 遇到错误时回滚事务
 			return err
 		}
 		return nil