解决冲突

src/Common/Config/CfgCenter.php

@@ -90,12 +90,8 @@ class CfgCenter
 		$result = $dbConn->get("seller", ['oemId'], ['storeId' => $storeId]);
 		$result = $dbConn->get("seller", ['oemId'], ['storeId' => $storeId]);
 		$oemId = (int)$result['oemId'];
 		$oemId = (int)$result['oemId'];
 		$dbConn = self::dbConnect();//连接配置库
 		$dbConn = self::dbConnect();//连接配置库
-<<<<<<< HEAD
-		$result = $dbConn->get("config", ['certPem', 'keyPem'], ['oemId' => $oemId, 'name' => $keyName]);
-=======
 		// 注意，需要返回oemId字段
 		// 注意，需要返回oemId字段
 		$result = $dbConn->get("config", ['oemId', 'certPem', 'keyPem'], ['oemId' => $oemId, 'name' => $keyName]);
 		$result = $dbConn->get("config", ['oemId', 'certPem', 'keyPem'], ['oemId' => $oemId, 'name' => $keyName]);
->>>>>>> ft-oem
 		return $result;
 		return $result;
 	}
 	}