From 0e4b49f4bee160790b1830e6a8606e739b32fc3b Mon Sep 17 00:00:00 2001
From: rk <94314517@qq.com>
Date: 星期三, 11 三月 2026 09:09:45 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 admin/src/views/business/platformGoods.vue |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/admin/src/views/business/platformGoods.vue b/admin/src/views/business/platformGoods.vue
index 6685444..061841f 100644
--- a/admin/src/views/business/platformGoods.vue
+++ b/admin/src/views/business/platformGoods.vue
@@ -90,8 +90,8 @@
         </el-table-column>
         <el-table-column prop="categoryName" label="鎵�灞炲垎绫�" min-width="120px"></el-table-column>
         <el-table-column prop="brandName" label="鎵�灞炲搧鐗�" min-width="120px"></el-table-column>
-        <el-table-column prop="showPrice" label="鍑哄巶浠�(鍏冿級" min-width="100px"></el-table-column>
-        <el-table-column prop="price" label="鍒掔嚎浠�(鍏冿級" min-width="100px"></el-table-column>
+        <el-table-column prop="price" label="鍑哄巶浠�(鍏冿級" min-width="100px"></el-table-column>
+        <el-table-column prop="showPrice" label="鍒掔嚎浠�(鍏冿級" min-width="100px"></el-table-column>
         <el-table-column prop="skuPrice" label="閿�鍞环(鍏�)" min-width="100px"></el-table-column>
         <el-table-column prop="shopPrice" label="渚涜揣浠疯缃�" min-width="100px" align="center">
           <template slot-scope="{row}" >

--
Gitblit v1.9.3