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

liyong

8 天以前 79c1c457302663154f23325116614cf33d8f575b

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

@@ -70,7 +70,7 @@
        </where>
        order by sir.id desc
    </select>
    <select id="listPageAccountPurchase" resultType="com.ruoyi.account.bean.vo.PurchaseInboundVo">
    <select id="listPageAccountPurchase" resultType="com.ruoyi.account.bean.vo.purchase.PurchaseInboundVo">
        SELECT
            sir.id,
            sir.inbound_batches,