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

maven

昨天 f4e70436bb93ab6cc7e2b8c27afa9a5978371855

 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>