setup

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

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