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

gongchunyi

3 天以前 2d1e904f3049218474318cb1e2fe5c3a3869cfb0

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

@@ -28,12 +28,14 @@
    /**
     * 层数
     */
    private Long storey;
    @TableField("`row`")
    private Long row;

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

    /**
     * 货架id