Merge branch 'master' of http://gitlab.oytour.com/zk123/hotelproject

src/components/assetsman/HotelList.vue

@@ -79,7 +79,7 @@
                 <span>{{getDate(row.UpdateTime)}}</span>
             </template>
         </vxe-table-column>
-        <vxe-table-column field="Status" title="ホテル状態"></vxe-table-column>
+        <vxe-table-column field="StatusStr" title="ホテル状態"></vxe-table-column>
         <vxe-table-column field="address" title="操作">
             <template  v-slot="{ row }">
                 <el-tooltip class="item" effect="dark" content="修正" placement="top" >