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

maven

2026-02-03 2ac14cef837ceaa5201d6266485ab672f6f3d650

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

@@ -72,6 +72,9 @@
        <if test="ew.productName != null and ew.productName !=''">
            and p.product_name like concat('%',#{ew.productName},'%')
        </if>
        <if test="ew.parentId != null">
            and p.parent_id = #{ew.parentId}
        </if>
    </select>
    <select id="listStockInventoryExportData" resultType="com.ruoyi.stock.execl.StockInventoryExportData">
        select si.qualitity,