Merge remote-tracking branch 'origin/master'

src/main/resources/mapper/manage/NewsDao.xml

@@ -710,6 +710,9 @@ ORDER BY
         <if test="newsParams.editor !=null and newsParams.editor !=''">
             and editor =#{newsParams.editor}
         </if>
+        <if test="newsParams.classId !=null and newsParams.classId !=''">
+            and classid =#{newsParams.classId}
+        </if>
         order by id desc
     </select>
 </mapper>
\ No newline at end of file