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

1

昨天 c620f4cbc6f5ed50758ea548855773bfed2dcd39

 rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/params/LocAreaMatsParam.java

@@ -26,6 +26,12 @@
    @ApiModelProperty("库区ID")
    private Long areaId;

    @ApiModelProperty("仓库ID")
    private Long warehouseId;

    @ApiModelProperty("主单ID")
    private Long areaMatId;

    @ApiModelProperty("库位类型")
    private List<Long> typeId;