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

zss

5 天以前 5a6ac2ffb3815f1ef510144dd6e88c64ee96f973

 src/main/resources/mapper/stock/StockInRecordMapper.xml

@@ -20,6 +20,9 @@
            <if test="params.productName != null and params.productName != ''">
                and p.product_name like concat('%',#{params.productName},'%')
            </if>
            <if test="params.type != null and params.type != ''">
                and sir.type = #{params.type}
            </if>
        </where>
        order by sir.id desc
    </select>