Merge remote-tracking branch 'origin/master'

18516761980

2021-11-05 8d0d6126ea8d17df13d62a8dd6a5a6e2b8d279c3

 src/main/resources/mapper/LocDetlMapper.xml

@@ -53,8 +53,8 @@
        <if test="supplier!=null and supplier!=null">
            and a.supplier like '%' + #{supplier} + '%'
        </if>
        <if test="warehouse!=null and warehouse!=null">
            and a.warehouse like '%' + #{warehouse} + '%'
        <if test="mnemonic!=null and mnemonic!=null">
            and a.mnemonic like '%' + #{mnemonic} + '%'
        </if>
    </sql>