合并

dist/index.html

@@ -6,7 +6,11 @@
   <link rel="icon" type="image/svg+xml" href="./vite.svg" />
   <meta name="viewport" content="width=device-width, initial-scale=1.0" />
   <title>IM</title>
+<<<<<<< HEAD
   <script type="module" crossorigin src="./assets/index-8c27764c.js"></script>
+=======
+  <script type="module" crossorigin src="./assets/index-0a2722af.js"></script>
+>>>>>>> iteration-oss-up
   <link rel="stylesheet" href="./assets/index-1ac9eac8.css">
 </head>
 

src/TUIKit/TUIComponents/container/TUIChat/message-input/message-input-at.vue

@@ -277,6 +277,7 @@ export { MessageInputAtSuggestion, MessageInputAtComponent };
   }
   &-body {
     height: 2.5rem;
+    padding: 0 10px;
     cursor: pointer;
     display: flex;
     align-items: center;
@@ -295,7 +296,6 @@ export { MessageInputAtSuggestion, MessageInputAtComponent };
   img {
     width: 1.5rem;
     height: 1.5rem;
-    padding-left: 10px;
   }
   .selected {
     background: rgba(0, 110, 255, 0.1);