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

liding

17 小时以前 820e9e9e5e4ce7e8fb477ae8f2573dab1f2074de

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

@@ -17,5 +17,6 @@
                and n.status = #{ew.status}
            </if>
        </where>
        order by n.create_time desc
    </select>
</mapper>