diff --git a/jjb.config.js b/jjb.config.js
index 4d10538..b0d2540 100644
--- a/jjb.config.js
+++ b/jjb.config.js
@@ -10,14 +10,10 @@ module.exports = {
       javaGitBranch: "dev",
       // 本地联调 safetyEval-service（context-path: /safetyEval，默认端口 8095）
       // 可通过环境变量覆盖: SAFETY_EVAL_API_HOST=http://192.168.x.x:8095
-      API_HOST:  "https://gbs-gateway.qhdsafety.com",
+      // API_HOST:  "https://gbs-gateway.qhdsafety.com",
 
      // API_HOST:  "http://192.168.0.134",
-<<<<<<< HEAD
-     // API_HOST:  "http://192.168.0.150", //太浅
-=======
      //API_HOST:  "http://192.168.0.150", //太浅
->>>>>>> origin/dev
      // API_HOST:  "http://192.168.0.152",
       API_HOST:  "http://192.168.0.103", //huwei
     },