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

zjj

3 天以前 eab76cd34bff799686f68e6b70f86c9001e4913f

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

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

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

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

    /**
     * 库位
@@ -194,7 +197,6 @@
     * 是否删除 1: 是  0: 否  
     */
    @ApiModelProperty(value= "是否删除 1: 是  0: 否  ")
    @TableLogic
    private Integer deleted;

    /**