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

buhuazhen

7 天以前 c449e0d7e5e537cd8dfb5928572db31d0310bc0e

 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>