新增：并入shop、cms、oa三大模块代码

src/views/shop/merchantApply/index.vue

@@ -29,6 +29,9 @@
             <template v-if="column.key === 'image'">
               <a-image :src="record.image" :width="50" />
             </template>
+            <template v-if="column.key === 'shopType'">
+              <a-tag>{{ record.shopType }}</a-tag>
+            </template>
             <template v-if="column.key === 'status'">
               <a-tag v-if="record.status === 0" color="orange">待审核</a-tag>
               <a-tag v-if="record.status === 1" color="green">审核通过</a-tag>
@@ -121,10 +124,12 @@
   // 表格列配置
   const columns = ref<ColumnItem[]>([
     {
-      title: 'ID',
-      dataIndex: 'applyId',
-      key: 'applyId',
-      width: 90
+      key: 'index',
+      width: 48,
+      align: 'center',
+      fixed: 'left',
+      hideInSetting: true,
+      customRender: ({ index }) => index + (tableRef.value?.tableIndex ?? 0)
     },
     {
       title: '商户名称',
@@ -132,6 +137,12 @@
       key: 'merchantName',
       align: 'center'
     },
+    {
+      title: '店铺类型',
+      dataIndex: 'shopType',
+      key: 'shopType',
+      align: 'center'
+    },
     {
       title: '商户姓名',
       dataIndex: 'realName',
@@ -144,12 +155,6 @@
       key: 'phone',
       align: 'center'
     },
-    {
-      title: '店铺类型',
-      dataIndex: 'shopType',
-      key: 'shopType',
-      align: 'center'
-    },
     {
       title: '申请时间',
       dataIndex: 'createTime',