Merge pull request 'patch' (#53) from zhangwei into dev

Reviewed-on: #53

app/common/controller/ImController.php

@@ -224,10 +224,10 @@ class ImController extends BaseLikeAdminController
             $sendData = [
                 'id' => $model->id,
                 'from_user_id' => $params['from_user_id'],
-                'from_user_name' => $fromUserInfo['nickname'],
+                'from_user_name' => $fromUserInfo['name'],
                 'from_user_avatar' => $fromUserInfo['avatar'],
                 'to_user_id' => $params['to_user_id'],
-                'to_user_name' => $toUserInfo['nickname'],
+                'to_user_name' => $toUserInfo['name'],
                 'to_user_avatar' => $toUserInfo['avatar'],
                 'content' => $result['data'],
                 'type' => $params['type'],
@@ -336,6 +336,7 @@ class ImController extends BaseLikeAdminController
         return $this->success('请求成功',$users);
     }
 
+    //获取片区经理用户id
     public function getAreaManager(): Json
     {
         //验证请求方式