diff --git a/src/api/manage/hotel/types.ts b/src/api/manage/hotel/types.ts
index d737c29..2e43ea5 100644
--- a/src/api/manage/hotel/types.ts
+++ b/src/api/manage/hotel/types.ts
@@ -53,7 +53,14 @@ export interface HotelVO {
    * 更新时间
    */
   updateTime: string;
-
+  /**
+   * 商家图片
+   */
+  imgUrl: string;
+  /**
+   * 详细地址
+   */
+  address: string;
 }
 
 export interface HotelForm extends BaseEntity {
diff --git a/src/views/manage/hotel/index.vue b/src/views/manage/hotel/index.vue
index dc07b9c..2973d5d 100644
--- a/src/views/manage/hotel/index.vue
+++ b/src/views/manage/hotel/index.vue
@@ -8,7 +8,7 @@
               <el-input v-model="queryParams.name" placeholder="请输入住宿商家名称" clearable @keyup.enter="handleQuery" />
             </el-form-item>
             <el-form-item label="发布状态" prop="status">
-              <el-select v-model="queryParams.tagId" placeholder="请选择发布状态" style="width: 200px" @keyup.enter="handleQuery">
+              <el-select v-model="queryParams.status" placeholder="请选择发布状态" style="width: 200px" @keyup.enter="handleQuery">
                 <el-option label="未发布" value="0" />
                 <el-option label="审核中" value="1" />
                 <el-option label="已发布" value="2" />
@@ -29,9 +29,6 @@
           <el-col :span="1.5">
             <el-button v-hasPermi="['manage:hotel:add']" type="primary" plain icon="Plus" @click="handleAdd">新增</el-button>
           </el-col>
-          <el-col :span="1.5">
-            <el-button v-hasPermi="['manage:hotel:edit']" type="success" plain icon="Edit" :disabled="single" @click="handleUpdate()">修改</el-button>
-          </el-col>
           <el-col :span="1.5">
             <el-button v-hasPermi="['manage:hotel:remove']" type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()"
               >删除</el-button
@@ -43,16 +40,16 @@
 
       <el-table v-loading="loading" :data="hotelList" @selection-change="handleSelectionChange">
         <el-table-column type="selection" width="55" align="center" />
-        <el-table-column v-if="true" label="用户ID" align="center" prop="id" />
+        <el-table-column v-if="true" label="ID" align="center" prop="id" />
         <el-table-column label="住宿商家名称" align="center" prop="name" />
-        <el-table-column label="商家图片" align="center" prop="name" />
-        <el-table-column label="商家地理位置" align="center" prop="name" />
+        <el-table-column label="商家图片" align="center" prop="imageUrl" />
+        <el-table-column label="商家地理位置" align="center" prop="address" />
         <el-table-column label="联系方式" align="center" prop="number" />
         <el-table-column label="状态" align="center" prop="status">
           <template #default="scope">
-            <el-tag v-if="scope.roe.status == 2" type="primary">已发布</el-tag>
-            <el-tag v-if="scope.roe.status == 1" type="success">审核中</el-tag>
-            <el-tag v-if="scope.roe.status == 0" type="info">未发布</el-tag>
+            <el-tag v-if="scope.row.status == 2" type="primary">已发布</el-tag>
+            <el-tag v-if="scope.row.status == 1" type="success">审核中</el-tag>
+            <el-tag v-if="scope.row.status == 0" type="info">未发布</el-tag>
           </template>
         </el-table-column>
         <el-table-column label="更新者" align="center" prop="updateBy" />
@@ -84,11 +81,11 @@
         <el-form-item label="联系电话" prop="number">
           <el-input v-model="form.number" placeholder="请输入联系电话" style="width: 300px" />
         </el-form-item>
-        <el-form-item label="商家图片" prop="number">
-          <el-input v-model="form.number" placeholder="请输入商家图片" style="width: 300px" />
+        <el-form-item label="商家图片" prop="imgUrl">
+          <el-input v-model="form.imgUrl" placeholder="请输入商家图片" style="width: 300px" />
         </el-form-item>
-        <el-form-item label="商家地理位置" prop="number">
-          <el-input v-model="form.number" placeholder="请输入商家地理位置" style="width: 300px" />
+        <el-form-item label="商家地理位置" prop="address">
+          <el-input v-model="form.address" placeholder="请输入商家地理位置" style="width: 300px" />
         </el-form-item>
       </el-form>
       <template #footer>
diff --git a/src/views/manage/noteManage/index.vue b/src/views/manage/noteManage/index.vue
index e948de1..586c5d7 100644
--- a/src/views/manage/noteManage/index.vue
+++ b/src/views/manage/noteManage/index.vue
@@ -91,18 +91,15 @@
         <el-table-column label="操作时间" align="center" prop="updateTime" width="200px" />
         <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
           <template #default="scope">
-<<<<<<< HEAD
             <el-tooltip content="修改" placement="top">
               <el-button v-hasPermi="['manage:notebook:edit']" link type="primary" icon="Edit" @click="handleUpdate(scope.row)"></el-button>
             </el-tooltip>
-=======
             <el-tooltip content="编辑" placement="top">
               <el-button v-hasPermi="['manage:notebook:edit']" link type="primary" icon="Edit" @click="handleUpdate(scope.row)"></el-button>
             </el-tooltip>
 <!--            <el-tooltip content="发布" placement="top">-->
 <!--              <el-button v-hasPermi="['manage:notebook:edit']" link type="primary" icon="Edit" @click="handleUpdate(scope.row)"></el-button>-->
 <!--            </el-tooltip>-->
->>>>>>> 59bcf39 (住宿管理)
             <el-tooltip content="删除" placement="top">
               <el-button v-hasPermi="['manage:notebook:remove']" link type="primary" icon="Delete" @click="handleDelete(scope.row)"></el-button>
             </el-tooltip>