Merge remote-tracking branch 'origin/dev_天津_阳光彩印' into dev_天津_阳光彩印

buhuazhen

2 天以前 5de00e436cb41dee07b75c20391db7bc0a5b3660

 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