Merge branch 'web_sannong_fr'

app/JsonRpc/WebsiteService.php

@@ -2262,7 +2262,7 @@ class WebsiteService implements WebsiteServiceInterface
                     $join->on('pc.pid', '=', 'website_category.category_id')
                         ->where('pc.website_id', '=', $data['website_id']);
                 })
-                ->select('website_category.category_id', 'website_category.alias', DB::raw('CASE WHEN pc.category_id IS NOT NULL THEN 1 ELSE 0 END as children_count'))
+                ->select('website_category.category_id','website_category.type', 'website_category.alias', DB::raw('CASE WHEN pc.category_id IS NOT NULL THEN 1 ELSE 0 END as children_count'))
                 ->first();
         }
         if (isset($data['foot_pinyin']) && !empty($data['foot_pinyin'])) {