From 45a54340dda4e8f3f4cd744b5061efd11c277398 Mon Sep 17 00:00:00 2001
From: zmj <1493694146@qq.com>
Date: Mon, 13 May 2024 18:08:39 +0800
Subject: [PATCH] add

---
 .env.development                             | 4 ++--
 src/views/opurchase/opurchaseclass/index.vue | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.env.development b/.env.development
index a4d7f18..3875c7d 100644
--- a/.env.development
+++ b/.env.development
@@ -1,5 +1,5 @@
 NODE_ENV = 'development'
 VITE_NOW_TYPE = 'dist'
 # Base API
-VITE_APP_BASE_URL='http://192.168.1.16:8546'
-# VITE_APP_BASE_URL='https://erp.lihaink.cn'
\ No newline at end of file
+# VITE_APP_BASE_URL='http://192.168.1.16:8546'
+VITE_APP_BASE_URL='https://erp.lihaink.cn'
\ No newline at end of file
diff --git a/src/views/opurchase/opurchaseclass/index.vue b/src/views/opurchase/opurchaseclass/index.vue
index f460407..59459fa 100644
--- a/src/views/opurchase/opurchaseclass/index.vue
+++ b/src/views/opurchase/opurchaseclass/index.vue
@@ -35,7 +35,7 @@
                 <el-table :data="pager.lists" @selection-change="handleSelectionChange">
                     <el-table-column type="selection" width="55" />
                     <el-table-column label="ID" prop="id" show-overflow-tooltip />
-                    <el-table-column label="所属商户" prop="mer_name" show-overflow-tooltip />
+                    <el-table-column label="所属商户" prop="merchant_name" show-overflow-tooltip />
                     <el-table-column label="零售订单id" prop="order_arr" show-overflow-tooltip />
                     <el-table-column label="购物车id" prop="cart_id" show-overflow-tooltip />
                     <el-table-column label="单据编号" prop="number" width="220" show-overflow-tooltip />