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

liyong

22 小时以前 6b39b27a2807f4fb60e3b8ac12a1bb5deaad7775

 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