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

config.py

@@ -7,7 +7,7 @@ class BaseConfig():
     # 当前运行的产品名
     current_product = "bmc"
     default_test_case_dir = "test_case/bmc/"
-
+    salt = 'hikcreate_xj'                       # SSO的登录用的
 
 class BMCConfig(BaseConfig):
     """斑马信用app的配置类"""
@@ -17,5 +17,5 @@ class BMCConfig(BaseConfig):
     test_case_dir = "test_case/bmc/"
     test_case_data_dir = "test_case_data/bmc/"
     webhook = ''
-    salt = 'hikcreate_xj'
+