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

buhuazhen

7 天以前 9a5d984a74d5f893fc51366b42391d9b4f8a83ed

 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>