Merge remote-tracking branch 'origin/new-exam' into new-exam

ruoyi-system/src/main/resources/mapper/system/SysNoticeMapper.xml

@@ -82,7 +82,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </foreach>
     </delete>
 
-    <select id="selectList" parameterType="SysNotice" resultMap="SysNoticeResult">
+    <select id="selectList"  resultMap="SysNoticeResult">
         <include refid="selectNoticeVo"/>
         where notice_type='3'
     </select>