Merge dev_New_pro into dev_山西_晋和园_pro

gongchunyi

3 天以前 10b88a7ff17caf92f3d4e8a550c1085a70c2517a

 src/main/resources/mapper/approve/ApproveProcessMapper.xml

@@ -41,7 +41,7 @@
        <if test="req.approveType != null ">
            and approve_type = #{req.approveType}
        </if>
        order by approve_time desc
        order by id desc
    </select>

</mapper>