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

yaowanxin

2 天以前 a0fa5fa2d82f659a4b3e4a285a1f8603cc93ba86

 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>