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

云

2 天以前 8c0d4b8f762b1e1535379c604fdc8e2530dc6c8a

 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>