Merge branch 'master' into dev

app/admin/service/goods/GoodsService.php

@@ -187,8 +187,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_attribute_json', '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 . '%');
                 });
             })->when($categoryId != null, function ($query) use ($categoryId) {
                 $query->whereIn('join_goods_category_id', $categoryId);