Merge branch 'ft-hdllh5' into test

src/Common/Entity/User.php

@@ -163,9 +163,9 @@ class User
         return $this->getValue('openid');
         return $this->getValue('openid');
     }
     }
 
 
-    public function getMpOpenId()
+    public function getOrigin()
     {
     {
-        return $this->getValue('mpOpenid');
+        return $this->getValue('origin');
     }
     }
 
 
     public function getUnionid()
     public function getUnionid()