Merge branch 'dev_New_pro' into dev_宁夏_英泽防锈

云

9 天以前 66c6ab9883ecb5e0595f02fec6b66e962d1fbf67

 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>