diff --git a/resources/assets/js/pages/manage/components/DialogWrapper.vue b/resources/assets/js/pages/manage/components/DialogWrapper.vue
index 6d4dd4b5c..7070f286e 100644
--- a/resources/assets/js/pages/manage/components/DialogWrapper.vue
+++ b/resources/assets/js/pages/manage/components/DialogWrapper.vue
@@ -1715,7 +1715,7 @@ export default {
                 this.replyActiveUpdate = true
                 let {text} = this.operateItem.msg
                 if (text.indexOf("mention") > -1) {
-                    text = text.replace(/<span class="mention (.*?)" data-id="(\d+)">@(.*?)<\/span>/g, '<span class="mention" data-denotation-char="@" data-id="$2" data-value="$3">&#xFEFF;<span contenteditable="false"><span class="ql-mention-denotation-char">@</span>$3</span>&#xFEFF;</span>')
+                    text = text.replace(/<span class="mention (.*?)" data-id="(\d+)">([@#])(.*?)<\/span>/g, '<span class="mention" data-denotation-char="$3" data-id="$2" data-value="$4">&#xFEFF;<span contenteditable="false"><span class="ql-mention-denotation-char">$3</span>$4</span>&#xFEFF;</span>')
                 }
                 this.msgText = $A.formatMsgBasic(text)
             }