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

buhuazhen

2026-03-06 b7eb6e87b4d88e5a419b64e3e3d0e5dc1be0f48f

 src/main/java/com/ruoyi/warehouse/pojo/WarehouseGoodsShelves.java

@@ -26,16 +26,18 @@
    /**
     * 货架名称
     */
    private String goodsShelvesName;
    private String name;
    /**
     * 层数
     */
    private Long storey;
    @TableField("`row`")
    private Long row;

    /**
     * 列数
     */
    private Long arrange;
    @TableField("`col`")
    private Long col;

    /**
     * 仓库id