Merge branch 'development' of http://gitlab-ebiz.yiyao365.cn/newshop/newshopback into development

backend/models/v1/rbacuser/ShopRbacUser.php

@@ -15,7 +15,7 @@ use backend\helpers\Func;
  * @property string $NAME 姓名
  * @property string $PASSWORD 密码
  * @property string $ORG_GUID 组织机构号
- * @property string $EMPLOYEE_GUID 如果USERGROUPGUID是店长或省级管理员，用来存门店GUID或省级GUID
+ * @property string $BRANCH_GUID 如果USERGROUPGUID是店长或省级管理员，用来存门店GUID或省级GUID
  * @property string $CREATE_GUID 创建人GUID
  * @property string $CREATE_NAME 创建人姓名
  * @property string $CREATE_DATE 创建时间
@@ -55,7 +55,7 @@ class ShopRbacUser extends  BaseModel implements IdentityInterface
             [['GUID', 'CODE'], 'required'],
             [['CREATE_DATE', 'UPDATE_DATE'], 'safe'],
             [['IS_FORBID', 'CONTACTSEX', 'IS_UPLOAD_HX', 'IS_BELONG', 'AGE'], 'integer'],
-            [['GUID', 'CODE', 'PASSWORD', 'ORG_GUID', 'EMPLOYEE_GUID', 'CREATE_GUID', 'UPDATE_GUID', 'MOBILEPHONE', 'USER_GUID', 'REMARK', 'ALIPAY_UID', 'WX_UNIONID', 'WX_OPENID', 'SHARE_NO'], 'string', 'max' => 50],
+            [['GUID', 'CODE', 'PASSWORD', 'ORG_GUID', 'BRANCH_GUID', 'CREATE_GUID', 'UPDATE_GUID', 'MOBILEPHONE', 'USER_GUID', 'REMARK', 'ALIPAY_UID', 'WX_UNIONID', 'WX_OPENID', 'SHARE_NO'], 'string', 'max' => 50],
             [['NAME', 'CREATE_NAME', 'UPDATE_NAME'], 'string', 'max' => 100],
             [['DESCRIPTION'], 'string', 'max' => 255],
             [['GUID'], 'unique'],
@@ -73,7 +73,7 @@ class ShopRbacUser extends  BaseModel implements IdentityInterface
             'NAME' => 'Name',
             'PASSWORD' => 'Password',
             'ORG_GUID' => 'Org Guid',
-            'EMPLOYEE_GUID' => 'Employee Guid',
+            'BRANCH_GUID' => 'Branch Guid',
             'CREATE_GUID' => 'Create Guid',
             'CREATE_NAME' => 'Create Name',
             'CREATE_DATE' => 'Create Date',
@@ -148,7 +148,7 @@ class ShopRbacUser extends  BaseModel implements IdentityInterface
                 $model->attributes = $temp;
                 return $model;
             }
-            throw new HttpException('404','用户存在');
+            throw new HttpException('404','用户不存在');
         }
         return false;