Merge remote-tracking branch 'refs/remotes/yudao/dev' into dev

2024-12-05 17:48:01 +08:00
parent f7477c3264 4754685d84
commit 2835c9d111
121 changed files with 13202 additions and 12518 deletions
--- a/src/views/mall/promotion/article/index.vue
+++ b/src/views/mall/promotion/article/index.vue
@ -80,6 +80,7 @@
  <!-- 列表 -->
  <ContentWrap>
    <el-table v-loading="loading" :data="list" :show-overflow-tooltip="true" :stripe="true">
+      <el-table-column align="center" label="ID" min-width="180" prop="id" />
      <el-table-column align="center" label="封面" min-width="80" prop="picUrl">
        <template #default="{ row }">
          <el-image :src="row.picUrl" class="h-30px w-30px" @click="imagePreview(row.picUrl)" />