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

zss

2026-01-20 33730ba5f81f78bf2c63fa792b6b8e65d94c4ca9

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

@@ -32,5 +32,11 @@
        <if test="req.approveId != null and req.approveId != ''">
            and approve_id like concat('%',#{req.approveId},'%')
        </if>
        <if test="req.approveStatus != null or req.approveStatus == 0">
            and approve_status = #{req.approveStatus}
        </if>
        <if test="req.approveType != null ">
            and approve_type = #{req.approveType}
        </if>
    </select>
</mapper>