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

liyong

9 天以前 41b6d0c9c00b24534a90bbd4cdeb0537cb889c67

 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>