Merge remote-tracking branch 'origin/dev' into dev

# Conflicts:
#	jjb.config.js

jjb.config.js

@@ -10,9 +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.150", //太浅
+      //API_HOST:  "http://192.168.0.150", //太浅
       //API_HOST:  "http://192.168.0.152",
+      API_HOST:  "http://192.168.0.103", //huwei
     },
     production: {
       // 应用后端分支名称，部署上线需要