合并

app/Models/MemberModel.php

@@ -27,8 +27,6 @@ class MemberModel extends BaseModel
 
 
     /**
-<<<<<<< HEAD
-=======
      * 仓库
      * @return \Illuminate\Database\Eloquent\Relations\BelongsTo
      */
@@ -82,7 +80,6 @@ class MemberModel extends BaseModel
 
 
     /**
->>>>>>> ace46771d25615960bdb7dfbae0035dc322e4072
      * 获取会员信息
      * @param int $id 会员ID
      * @return array|string