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

gongchunyi

4 天以前 dfa9258c8879dbb0d1bfc00d7f939031d0bb623b

 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