Merge remote-tracking branch 'origin/master'

apps/news/Lib/Model/TopicsModel.class.php

@@ -61,6 +61,8 @@ class TopicsModel extends Model
         }else if ($type == 4) {	//排序
         }else if ($type == 4) {	//排序
             $orders = '`re_sort` DESC';
             $orders = '`re_sort` DESC';
         }
         }
+        var_dump(getAttachPathByAttachId(91));
+        die;
         return $this->where($map)->order($orders)->findPage(10);
         return $this->where($map)->order($orders)->findPage(10);
     }
     }