Merge branch 'master' of http://git.hanxiaonuan.cn:3000/zhangchao/go_blog

2024-11-07 10:12:59 +08:00
parent feaff725ce c628419559
commit d35f633f46
10 changed files with 111 additions and 10 deletions
--- a/main.go
+++ b/main.go
@@ -37,8 +37,12 @@ func init() {
 	flag.BoolVar(&isOrmDebug, "orm", true, "是否开启gorm的debug信息")
 	flag.Parse()

+<<<<<<< HEAD
 	//conf.SetUp()
 	conf.SetUp1()
+=======
+	conf.SetUp()
+>>>>>>> c628419559368f0270c2573d91a06a1a9531d53a
 	models.SetUp(isOrmDebug)
 }