merge：解决合并冲突

apps/bigmember_pc/src/components/article-item/ArticleItem.vue

@@ -456,11 +456,7 @@ export default {
       if (inFile) {
         const keyword = keywords[0]
         if (keyword?.length > 3) {
-<<<<<<< HEAD
           return `（<span class="highlight-text-orange-bd">${keyword.substring(
-=======
-          return `（<span class="highlight-text">${keyword.substring(
->>>>>>> main
             0,
             3
           )}</span>...在附件中）`
@@ -774,12 +770,7 @@ $border-color: #ececec;
   }
   .a-i-detail {
     width: calc(100% - 84px);
-<<<<<<< HEAD
     padding: 6px 40px 0 0;
-=======
-    max-width: 920px;
-    padding: 6px 40px 0 30px;
->>>>>>> main
     font-size: 14px;
     line-height: 22px;
     color: #686868;