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

zss

9 天以前 c483ee040589c0063724059228e7e6c8e4ff943c

 src/main/resources/mapper/purchase/PurchaseReturnOrdersMapper.xml

@@ -54,7 +54,7 @@
        where pro.id = #{id}
    </select>
    <select id="listPageAccountPurchaseReturn"
            resultType="com.ruoyi.account.bean.vo.PurchaseReturnVo">
            resultType="com.ruoyi.account.bean.vo.purchase.PurchaseReturnVo">
         select pro.id,
                pro.no returnNo,
                t.inboundBatches,