Merge branch 'master' into dev

app/admin/service/goods/GoodsService.php

@@ -287,8 +287,8 @@ class GoodsService
         ])->select('goods_id', 'join_goods_category_id', 'join_goods_supplier_id', 'creator_user_id', 'goods_status', 'goods_sales_price', 'goods_category', 'goods_name', 'goods_title', 'goods_cover', 'goods_sort', 'goods_addtimes', 'goods_updatetimes')
             ->when($goodsName != '', function ($query) use ($goodsName) {
                 $query->where(function ($q) use ($goodsName) {
-                    $q->where('goods_name', 'like', '%' . $goodsName . '%')
-                        ->OrWhere('goods_title', 'like', '%' . $goodsName . '%');
+                    $q->where('goods_name', 'like', '%' . $goodsName . '%');
+//                        ->OrWhere('goods_title', 'like', '%' . $goodsName . '%');
                 });
             })->whereIn('join_goods_category_id', $categoryId)
             ->orderBy('goods_sort', 'DESC')
@@ -298,8 +298,8 @@ class GoodsService
             ->toArray();
         $total = Goods::when($goodsName != '', function ($query) use ($goodsName) {
             $query->where(function ($q) use ($goodsName) {
-                $q->where('goods_name', 'like', '%' . $goodsName . '%')
-                    ->OrWhere('goods_title', 'like', '%' . $goodsName . '%');
+                $q->where('goods_name', 'like', '%' . $goodsName . '%');
+//                    ->OrWhere('goods_title', 'like', '%' . $goodsName . '%');
             });
         })->whereIn('join_goods_category_id', $categoryId)->count();