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

src/Common/Entity/User.php

@@ -37,6 +37,11 @@ class User
         return $this->getValue('id');
         return $this->getValue('id');
     }
     }
 
 
+    public function getOemId()
+    {
+        return $this->getValue('oemId');
+    }
+
     public function setTestFlag()
     public function setTestFlag()
     {
     {
         $this->setValue('testFlag', TestEnum::TEST_STORE_ID);
         $this->setValue('testFlag', TestEnum::TEST_STORE_ID);