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

zhou zhou

6 天以前 7c96576938ad64e30db51c597c6be3369dafe4b1

 rsf-server/src/main/java/com/vincent/rsf/server/api/controller/erp/params/ReportDataParam.java

@@ -49,6 +49,9 @@
    @ApiModelProperty("出库数量")
    private Double OutQty;

    @ApiModelProperty("库位")
    private String Zone;

    @ApiModelProperty("编辑用户")
    private String EditUser;