Merge remote-tracking branch 'origin/master'

src/main/resources/mybatis/business/storageRetrieval/BizStorageRetrievalMapper.xml

@@ -21,7 +21,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="deptId != null">t1.dept_id = #{deptId}</if>
         <if test="productId != null">AND t1.product_id = #{productId}</if>
         <if test="drawingNumber != null and drawingNumber != ''">AND t1.drawing_number = #{drawingNumber}</if>
-        <if test="technologyVersion != null and technologyVersion != ''">AND t1.technology_version = #{technologyVersion}</if>
         <if test="hasAddIds != null and hasAddIds.size >0">
             and t1.id not in
             <foreach collection="hasAddIds" item="item" index="index" open="(" separator="," close=")">