Merge remote-tracking branch 'upstream/gva_gormv2_dev' into gva_gormv2_dev

2021-08-21 17:38:59 +08:00
parent ac18cd6902 60d8abf816
commit ce67438ef0
23 changed files with 1770 additions and 981 deletions
--- a/server/model/system/sys_system.go
+++ b/server/model/system/sys_system.go
@@ -6,5 +6,5 @@ import (

 // 配置文件结构体
 type System struct {
-	Config config.Server
+	Config config.Server `json:"config"`
 }