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

云

18 小时以前 3d556b8defe1ff5b9aeb481bd1d0a67b2ded0192

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

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