Merge remote-tracking branch 'origin/master'

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

@@ -665,7 +665,7 @@ ORDER BY
     </select>
 
     <select id="columnList" resultType="java.util.Map">
-        select * from newsclass where p_id=2 and id not in (14,15,17)
+        select * from newsclass where p_id=2 and id not in (11)
     </select>
 
     <select id="selectYylyList" resultMap="newsMap">