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

liyong

2 天以前 b9d7eb36481c3ac327f85a38dab1cbee1163be40

 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