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

变更数据



查看合并请求 !2903

@@ -222,7 +222,7 @@ class TicketUploadDataController extends BaseController
                 unset($this->param['search']);
             }
             unset($this->map['type']);
-            $cate_list = $productCateModel->list($this->map, 'sort',['id','title']);
+            $cate_list = $productCateModel->list($this->map, 'sort',['id','title','pid']);
             if ($cate_list === false) {
                 $this->response('无分类');
             }
@@ -268,7 +268,7 @@ class TicketUploadDataController extends BaseController
             $this->map['name'] = ['like' , '%' . $this->map['search'] . '%'];
             unset($this->map['search']);
         }
-        $cate_list = $newsCateModel->list($this->map, 'sort',['id','name as title']);
+        $cate_list = $newsCateModel->list($this->map, 'sort',['id','name as title','pid']);
         if ($cate_list === false) {
             $this->response('error', Code::USER_ERROR);
         }
@@ -306,7 +306,7 @@ class TicketUploadDataController extends BaseController
             $this->map['name'] = ['like' , '%' . $this->map['search'] . '%'];
             unset($this->map['search']);
         }
-        $cate_list = $newsCateModel->list($this->map, 'sort',['id','name as title']);
+        $cate_list = $newsCateModel->list($this->map, 'sort',['id','name as title','pid']);
         if ($cate_list === false) {
             $this->response('error', Code::USER_ERROR);
         }