Merge branch 'dev_New_pro' into dev_New_pro_玉山机械

buhuazhen

2026-05-28 08553c034773008ba68b7b6709683b385610ee4f

 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>