Merge remote-tracking branch 'origin/dev_pro_河南鹤壁' into dev_pro_河南鹤壁

yuan

7 天以前 c0fe393c6a5877076a7b5646b3aee01448e84a98

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

@@ -367,6 +367,7 @@
                and sir.create_time <= #{ew.endMonth}
            </if>
        </where>
        order by sir.create_time desc
    </select>

    <select id="stockInAndOutRecord" resultType="com.ruoyi.stock.dto.StockInventoryDto">