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

云

7 天以前 8c0d4b8f762b1e1535379c604fdc8e2530dc6c8a

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

@@ -222,7 +222,7 @@
        unit,
        product_name,
        product_id
        order by combined.id desc
        order by combined.create_time desc
    </select>

    <select id="listStockInventoryExportData" resultType="com.ruoyi.stock.execl.StockInventoryExportData">