Merge branch 'develop' of https://gitlab.yidian-inc.com/bp/goods into develop

application/services/goods/GoodsService.php

@@ -887,7 +887,7 @@ class GoodsService
         $where["life_account_id"] = $lifeAccountId;
         $where["LIMIT"] = $limit;
         $where["ORDER"] = ["goods_spu_id" => "ASC"];
-        $list = GoodsSku::select(["goods_spu_id", "goods_sku_id", "goods_name", "desc_pic_url", "total_amount_sold", "inventory_rest", "original_price",
+        $list = GoodsSku::select(["goods_spu_id", "goods_sku_id", "goods_name", "desc", "desc_pic_url", "total_amount_sold", "inventory_rest", "original_price",
             "price", "audit_status", "online_status"], $where);
 
         $data = [];
@@ -903,6 +903,8 @@ class GoodsService
                 }
                 $lastId = $sku["goods_spu_id"];
             }
+        } else {
+            $lastId = -1;
         }
 
         return ["status_list" => $statusList, "goods_list" => $data, "last_id" => $lastId];