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

liyong

9 天以前 7e2abbf8f235d20e6c45aa6ce9dceb9eb93fd1c2

 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