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

yaowanxin

4 天以前 6f888b234148d1a4dbd1e6c28a8d9ed85ebfda09

 src/main/resources/mapper/warehouse/WarehouseMapper.xml

@@ -8,7 +8,7 @@
    <select id="findList" resultType="com.ruoyi.warehouse.dto.WarehouseDto">
        SELECT
        w.*,
        wgs.goods_shelves_name,
        wgs.name,
        doc.doc_name,
        doc.doc_number,
        dc.category