Merge branch 'devlop' of http://47.97.1.152:5880/r/wms-master into devlop

skyouc

3 天以前 5c90daa2c919f3f07df0a154ff91f0e015bf8d66

 rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/LocItem.java

@@ -100,6 +100,10 @@
    @TableField(exist = false)
    private Double outQty;

    @ApiModelProperty("巷道")
    @TableField(exist = false)
    private Integer channel;

    /**
     * 物料名称
     */
@@ -232,6 +236,9 @@
    @TableField(exist = false)
    private String sourceCode;

    @ApiModelProperty("出站口")
    @TableField(exist = false)
    private String siteNo;


    /**