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

云

7 天以前 8c0d4b8f762b1e1535379c604fdc8e2530dc6c8a

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

@@ -40,5 +40,6 @@
        <if test="req.approveType != null ">
            and approve_type = #{req.approveType}
        </if>
        order by id desc
    </select>
</mapper>