chore: 🔨 合并冲突解决

2024-11-16 23:00:30 +08:00
parent 2dd4421fdf
commit 711e3ba5f4
48 changed files with 207 additions and 791 deletions
--- a/src/views/system/notice/components/NoticeDetail.vue
+++ b/src/views/system/notice/components/NoticeDetail.vue
@@ -32,12 +32,8 @@
      </el-descriptions-item>
      <el-descriptions-item label="发布状态：">
        <el-tag v-if="notice.publishStatus == 0" type="info">未发布</el-tag>
-        <el-tag v-else-if="notice.publishStatus == 1" type="success">
-          已发布
-        </el-tag>
-        <el-tag v-else-if="notice.publishStatus == -1" type="warning">
-          已撤回
-        </el-tag>
+        <el-tag v-else-if="notice.publishStatus == 1" type="success">已发布</el-tag>
+        <el-tag v-else-if="notice.publishStatus == -1" type="warning">已撤回</el-tag>
      </el-descriptions-item>
      <el-descriptions-item label="发布人：">
        {{ notice.publisherName }}