Merge remote-tracking branch 'origin/devlop-phyz' into devlop-phyz

lbq

3 天以前 11db152ac1ee3d47e1047fb0c96fc7e10da345ac

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

@@ -43,9 +43,12 @@
    @ApiModelProperty(value= "主单ID")
    private Long locId;

    @ApiModelProperty("任务明细ID")
    @ApiModelProperty("任务ID")
    private Long taskId;

    @ApiModelProperty("库位明细ID")
    private Long locItemId;

    /**
     * 库位
     */