code review by hf: do merge liangzhifeng codes

@@ -130,10 +130,7 @@ class Helpers
     public static function getShoppingKeyByCookie()
     public static function getShoppingKeyByCookie()
     {
     {
         $cookie = isset($_COOKIE['_Spk']) ? $_COOKIE['_Spk'] : '';
         $cookie = isset($_COOKIE['_Spk']) ? $_COOKIE['_Spk'] : '';
-<<<<<<< HEAD
 
 
-=======
->>>>>>> develop
         return $cookie;
         return $cookie;
     }
     }