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

liding

7 天以前 db85e062349683b3131726fe90dcc99d4aff35ba

 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>