Merge branch 'dev_New_pro' into dev_pro_山西_晋和园

gongchunyi

2 天以前 d29080af4e965ba341cb85a5bc45ecd183c06783

 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>