Merge branch 'master' of http://git.0x00day.com:10080/hdll/hdll-services

src/Common/Entity/User.php

@@ -30,7 +30,7 @@ class User
 {
     private $id;
 
-    private $nickName;
+    private $nickname;
 
     private $storeId;
 
@@ -39,7 +39,7 @@ class User
     private $token;
 
     private $cmId;
-    
+
     private $sessionKey;
 
     private $scope;
@@ -47,7 +47,7 @@ class User
     private $referId;
 
     private $unionid;
-    
+
     private $openId;
 
 
@@ -60,9 +60,9 @@ class User
         return $this->id;
     }
 
-    public function getNickName()
+    public function getNickname()
     {
-        return $this->nickName;
+        return $this->nickname;
     }
 
     public function getStoreId()
@@ -85,9 +85,9 @@ class User
         return $this->id = $value;
     }
 
-    public function setNickName($value)
+    public function setNickname($value)
     {
-        return $this->nickName = $value;
+        return $this->nickname = $value;
     }
 
     public function setStoreId($value)
@@ -159,8 +159,8 @@ class User
     {
         return $this->cmId;
     }
-    
-    
+
+
     public function fill($arr)
     {
         foreach ($arr as $name =>  $value) {