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

yaowanxin

2025-09-04 ac135b66a5ab9f2f74c55961066974e815b88e9a

 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