合并分支 'lyh-server' 到 'master'

Lyh server



查看合并请求 !1496

@@ -105,7 +105,7 @@ class LyhImportTest extends Command
                 $categoryModel->edit(['route'=>$route,'pid'=>$pid],['id'=>$id]);
                 $categoryModel->edit(['route'=>$route,'pid'=>$pid],['id'=>$id]);
                 echo date('Y-m-d H:i:s') . '产品分类id：'. $id.PHP_EOL;
                 echo date('Y-m-d H:i:s') . '产品分类id：'. $id.PHP_EOL;
             }catch (\Exception $e){
             }catch (\Exception $e){
-                echo date('Y-m-d H:i:s') . '跳过的产品名称：'. $val[1];
+                echo date('Y-m-d H:i:s') . '跳过的名称：'. $val[1];
                 continue;
                 continue;
             }
             }
         }
         }

@@ -30,7 +30,7 @@ class CategoryController extends BaseController
     public function index(Category $category)
     public function index(Category $category)
     {
     {
         $this->map = $this->searchParam();
         $this->map = $this->searchParam();
-        $filed = ['id', 'project_id', 'pid', 'title', 'image', 'route','keywords', 'describe', 'status','created_at','sort'];
+        $filed = ['id', 'project_id', 'pid', 'title', 'image', 'route', 'status','created_at','sort'];
         $this->map['deleted_at'] = null;
         $this->map['deleted_at'] = null;
         $list = $category->list($this->map,['sort','id'],$filed);
         $list = $category->list($this->map,['sort','id'],$filed);
         $data = [];
         $data = [];