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

zss

3 天以前 e2c5b3a68bf3da47f5c1adf217ca96c7ec9a0076

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

@@ -35,5 +35,8 @@
        <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>