Merge branch 'dev_New_pro' into dev_新疆马铃薯pro

云

2026-05-30 16338016e73791cecbbdbdd73e972b29a06c59b1

 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>