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

gongchunyi

昨天 1bc0c6c7842e29711e576e58b0aca00fabd92df0

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

@@ -64,7 +64,7 @@
            and p.product_name like concat('%',#{ew.productName},'%')
        </if>
    </select>
    <select id="listStockInventoryExportData" resultType="com.ruoyi.stock.execl.StockInventoryExportData">
    <select id="listStockInventoryExportData" resultType="com.ruoyi.stock.execl.StockUnInventoryExportData">
        select su.*,
        pm.model,
        pm.unit,