# Conflicts: # app/controllers/mobile/forumThread.js # app/models/forumThread.js
Merge branch 'remould_0330_dashboard_optimize' of https://git.wxpai.cn/scrmgroup/pisns-forum-api into remould_0330_dashboard_optimize
帖子管理增加查询条件查询后台发的帖子
