From 209f78304cc76db760a1d9b3330b3870243a0722 Mon Sep 17 00:00:00 2001
From: lion <120344285@qq.com>
Date: Thu, 9 Feb 2023 15:26:53 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B4=BB=E5=8A=A8=E6=A0=B8=E9=94=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.development                             | 4 ++--
 src/views/business/component/addMerchant.vue | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.env.development b/.env.development
index 82421b8..ae62b32 100644
--- a/.env.development
+++ b/.env.development
@@ -2,5 +2,5 @@
 ENV = 'development'
 
 # base api
-#VUE_APP_BASE_API = https://yybtest.ali251.langye.net/
-VUE_APP_BASE_API = https://yunyubang.ali251.langye.net/
+VUE_APP_BASE_API = https://yybtest.ali251.langye.net/
+#VUE_APP_BASE_API = https://yunyubang.ali251.langye.net/
diff --git a/src/views/business/component/addMerchant.vue b/src/views/business/component/addMerchant.vue
index dc5a34a..dc2722f 100644
--- a/src/views/business/component/addMerchant.vue
+++ b/src/views/business/component/addMerchant.vue
@@ -165,7 +165,7 @@
             <span style="color: red;font-weight: 600;padding-right: 4px;">*</span>简称/用户名：
           </div>
           <div class="xy-table-item-content">
-            <el-input v-model="form.username" placeholder="请输入联系人电话" clearable style="width: 300px;"></el-input>
+            <el-input v-model="form.username" placeholder="请输入简称/用户名" clearable style="width: 300px;"></el-input>
           </div>
         </div>
       </template>