Merge remote-tracking branch 'origin/dev_宁夏_中盛建材' into dev_宁夏_中盛建材

gongchunyi

8 天以前 83f6a929a4a9ee2f67cfa6dd7d059c998380141d

 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