diff --git a/app/Models/WebSocketDialog.php b/app/Models/WebSocketDialog.php
index 7bd1e98dd..ceb33c8f7 100644
--- a/app/Models/WebSocketDialog.php
+++ b/app/Models/WebSocketDialog.php
@@ -112,6 +112,7 @@ class WebSocketDialog extends AbstractModel
         // 对方信息
         $dialog->dialog_user = null;
         $dialog->group_info = null;
+        $dialog->top_at = WebSocketDialogUser::whereDialogId($dialog->id)->whereUserid($userid)->value('top_at');
         switch ($dialog->type) {
             case "user":
                 $dialog_user = $builder->where('userid', '!=', $userid)->first();
diff --git a/docker/php/php.conf b/docker/php/php.conf
index 14a4861a6..0837cbf54 100644
--- a/docker/php/php.conf
+++ b/docker/php/php.conf
@@ -2,10 +2,10 @@
 directory=/var/www
 
 # 生产环境
-command=php bin/laravels start -i
+#command=php bin/laravels start -i
 
 # 开发环境
-#command=./bin/inotify ./app
+command=./bin/inotify ./app
 
 numprocs=1
 autostart=true
diff --git a/resources/assets/js/pages/manage/components/DialogWrapper.vue b/resources/assets/js/pages/manage/components/DialogWrapper.vue
index c9825f0d6..bb4c10acd 100644
--- a/resources/assets/js/pages/manage/components/DialogWrapper.vue
+++ b/resources/assets/js/pages/manage/components/DialogWrapper.vue
@@ -12,6 +12,7 @@
                         <Tag :color="tag.color" :fade="false">{{$L(tag.text)}}</Tag>
                     </template>
                     <h2>{{dialogData.name}}</h2>
+                    <label v-if="dialogData.top_at" class="top-text">{{$L('置顶')}}</label>
                     <em v-if="peopleNum > 0">({{peopleNum}})</em>
                 </div>
                 <template v-if="dialogData.type === 'group'">
diff --git a/resources/assets/sass/pages/components/dialog-wrapper.scss b/resources/assets/sass/pages/components/dialog-wrapper.scss
index 8cbc080b1..6148a3f13 100644
--- a/resources/assets/sass/pages/components/dialog-wrapper.scss
+++ b/resources/assets/sass/pages/components/dialog-wrapper.scss
@@ -82,6 +82,17 @@
                 font-weight: 500;
                 padding-left: 6px;
             }
+            .top-text{
+                width: 40px;
+                height: 24px;
+                border-radius:4px;
+                margin-left: 10px;
+                background-color: #8BCF70;
+                color:#FFFFFF;
+                text-align: center;
+                margin-top: 4px;
+                padding-top: 1px
+            }
         }
 
         .sub-title {