From 397e0c4a27c231e40cbc48b657cbd9fc88bc7ebb Mon Sep 17 00:00:00 2001
From: panlinlin <648540858@qq.com>
Date: 星期四, 07 一月 2021 16:52:18 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into wvp-28181-2.0

---
 web_src/src/components/ParentPlatformList.vue |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/web_src/src/components/ParentPlatformList.vue b/web_src/src/components/ParentPlatformList.vue
index 98b0b41..0d3ce69 100644
--- a/web_src/src/components/ParentPlatformList.vue
+++ b/web_src/src/components/ParentPlatformList.vue
@@ -152,7 +152,7 @@
       this.$axios.get(`/api/platforms/${that.count}/${that.currentPage - 1}`)
         .then(function (res) {
           that.total = res.data.total;
-          that.platformList = res.data.data;
+          that.platformList = res.data.list;
         })
         .catch(function (error) {
           console.log(error);

--
Gitblit v1.8.0