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

lsh

16 小时以前 3041eb1b0b76b75b916939e77c7ae97a80fe5af3

 src/main/resources/mapper/LocDetlMapper.xml

@@ -265,6 +265,12 @@
        <if test="payment != null">
            and t.payment = #{payment}
        </if>
        <if test="sku != null">
            and t.sku = #{sku}
        </if>
        <if test="supp != null">
            and t.supp = #{supp}
        </if>

    </sql>