Merge remote-tracking branch 'origin/dev_New_pro' into dev_New_pro

liyong

5 天以前 dbd7fd484b5c7ed00cb895f227645848c3677c08

 src/main/resources/mapper/collaborativeApproval/NoticeMapper.xml

@@ -11,11 +11,11 @@
                and n.title like concat('%',#{ew.title},'%')
            </if>
            <if test="ew.type != null">
                and n.type = #{ew.type}
                and n.type  = #{ew.type}
            </if>
            <if test="ew.status != null">
                and n.status = #{ew.status}
            </if>
        </where>
    </select>
</mapper>
</mapper>