Merge branch 'version1.5' of ssh://192.168.10.210:10022/wugg/stock into version1.5

app/admin/controller/Good.php

@@ -126,7 +126,7 @@ class Good extends \app\BaseController
         $total = ceil($count / $size);
         $page = $page >= $total ? $total : $page;
         $list = Db::name('good')->alias("a")->leftJoin("good_platform b","a.spuCode=b.spuCode")->where($where)->page
-            ($page,$size)->field("b.skuCode,b.platform_code,b.plat_code,b.id as good_id,a.*,b.addtime,b.updatetime,b.platform_code")
+            ($page,$size)->field("b.skuCode,b.platform_code,b.plat_code,b.id as good_id,a.*,b.addtime,b.updatetime")
             ->order("b.addtime desc")
             ->select();
         $data=[];