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

gongchunyi

5 天以前 cca82e1212056b0ec17e038912f3b0c2ba1e9c61

 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>