Merge remote-tracking branch 'origin/main' into i18n-dev-new

# Conflicts:
#	server/core/server.go
#	web/src/view/layout/header/tools.vue
#	web/src/view/superAdmin/authority/authority.vue
This commit is contained in:
pixelmaxQM
2024-08-04 16:12:14 +08:00
16 changed files with 189 additions and 81 deletions
+1 -2
View File
@@ -2,7 +2,6 @@ package core
import (
"fmt"
"github.com/flipped-aurora/gin-vue-admin/server/global"
"github.com/flipped-aurora/gin-vue-admin/server/initialize"
"github.com/flipped-aurora/gin-vue-admin/server/service/system"
@@ -39,7 +38,7 @@ func RunWindowsServer() {
fmt.Printf(`
%s gin-vue-admin
%s:v2.7.0
%s:v2.7.1
加群方式:微信号:shouzi_1994 QQ群:470239250
项目地址:https://github.com/flipped-aurora/gin-vue-admin
插件市场:https://plugin.gin-vue-admin.com