feat:es main 配置

src/db.json

@@ -36,7 +36,9 @@
       "size": 30,
       "version": "v7",
       "userName": "",
-      "password": ""
+      "password": "",
+      "esIndex": "bidding",
+      "esType": "bidding"
     },
     "other": {
       "address": "http://192.168.3.241:9205,http://192.168.3.149:9200",

src/go.mod

@@ -6,14 +6,9 @@ require (
 	app.yhyue.com/moapp/jyMarketing v0.0.2-0.20230308011651-df591d32df88
 	app.yhyue.com/moapp/jybase v0.0.0-20231026082242-8eb41c7bdda6
 	app.yhyue.com/moapp/jylog v0.0.0-20230522075550-05d7230ca545
-<<<<<<< HEAD
-	app.yhyue.com/moapp/jypkg v1.0.4-0.20231109032304-2da6db20132a
-	bp.jydev.jianyu360.cn/BaseService/userCenter v1.2.14
-	github.com/ClickHouse/clickhouse-go v1.5.4
-=======
 	app.yhyue.com/moapp/jypkg v1.0.6
 	bp.jydev.jianyu360.cn/BaseService/userCenter v1.2.15-0.20230925060020-8e4db0f1e13e
->>>>>>> hotfix/v4.8.53.2
+	github.com/ClickHouse/clickhouse-go v1.5.4
 	github.com/SKatiyar/qr v0.0.0-20151201054752-25b6bdf44e67
 	github.com/bwmarrin/snowflake v0.3.0
 	github.com/fsnotify/fsnotify v1.6.0