Merge branch 'dev'

dushixiang · dushixiang · commit 593555411dd9 · 2022-03-29T22:45:00.000+08:00
# Conflicts:
#	server/constant/const.go
diff --git a/server/constant/const.go b/server/constant/const.go
@@ -5,7 +5,7 @@ import (
 )
 
 const (
-	AppVersion = "v1.2.5"
+	AppVersion = "v1.2.6-beta"
 	AppName    = "Next Terminal"
 	AppBanner  = `
 	_______                   __    ___________                  .__              .__
diff --git a/web/package.json b/web/package.json
@@ -1,6 +1,6 @@
 {
   "name": "next-terminal",
-  "version": "1.2.5",
+  "version": "1.2.6-beta",
   "private": true,
   "dependencies": {
     "@ant-design/charts": "^1.2.13",
