Merge branch 'ozq-dev' into dev

app/index/controller/TopicNas.php

@@ -277,7 +277,7 @@ class TopicNas extends Common
             }
             if ( !empty($article_categorys_two) ) {
                 foreach ($article_categorys_new as &$vvv) {
-                    $vvv['child'] = isset($article_categorys_two[$vvv->pid])?$article_categorys_two[$vvv->pid]:'';
+                    $vvv['child'] = isset($article_categorys_two[$vvv->id])?$article_categorys_two[$vvv->id]:'';
                 }
             }
         }