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

liyong

9 天以前 7e2abbf8f235d20e6c45aa6ce9dceb9eb93fd1c2

 src/main/resources/mapper/warehouse/DocumentationFileMapper.xml

@@ -10,5 +10,8 @@
        <if test="documentationFile.name != null and documentationFile.name != '' ">
            AND name = #{documentationFile.name}
        </if>
        <if test="documentationFile.documentationId != null">
            AND documentation_id = #{documentationFile.documentationId}
        </if>
    </select>
</mapper>