Merge branch 'master' of http://39.98.194.76:3000/txct/wanyue_app

app/admin/service/goods/GoodsService.php

@@ -28,7 +28,7 @@ class GoodsService
             'running' => function ($query) {
                 $query->select('join_running_goods_id', 'goods_running_storage');
             }
-        ])->select('goods_id', 'join_goods_category_id', 'join_goods_device_ledger_id', 'goods_status', 'goods_sales_price', 'goods_category', 'goods_name', 'goods_title', 'goods_cover', 'goods_sort', 'goods_addtimes')
+        ])->select('goods_id', 'join_goods_category_id', 'goods_status', 'goods_sales_price', 'goods_category', 'goods_name', 'goods_title', 'goods_cover', 'goods_sort', 'goods_addtimes')
             ->when($goodsName != '', function ($query) use ($goodsName) {
                 $query->where(function ($q) use ($goodsName) {
                     $q->where('goods_name', 'like', '%' . $goodsName . '%')