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

zjj

3 天以前 bed735aae42b6e0c75bf3fd63d9cd0996fba9355

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

@@ -43,6 +43,9 @@
    @ApiModelProperty(value= "质检明细单ID")
    private Long isptItemId;

    @ApiModelProperty("收货区库存ID")
    private Long rcptId;

    /**
     * 数量
     */