Merge branch 'master' into gva_gormv2_dev

496bbeb0 · songzhibin97 · 6ccc4c0e · ea693efc · 496bbeb0 · 496bbeb0
显示空白变更内容
内联并排

Showing with 4 addition and 4 deletion

server/config.docker.yaml server/config.docker.yaml +2 -2

server/config.yaml server/config.yaml +2 -2

未找到文件。
--- a/server/config.docker.yaml
+++ b/server/config.docker.yaml
@@ -61,8 +61,8 @@ mysql:
  password: ''
  max-idle-conns: 10
  max-open-conns: 100
-  log-mode: false
-  log-zap: ""
+  log-mode: ""
+  log-zap: false

 # local configuration
 local:

--- a/server/config.yaml
+++ b/server/config.yaml
@@ -62,8 +62,8 @@ mysql:
  password: ''
  max-idle-conns: 10
  max-open-conns: 100
-  log-mode: false
-  log-zap: ""
+  log-mode: ""
+  log-zap: false

 # local configuration
 local: