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

1

昨天 a657efd0e2b95ea386317ac8931c5d85f4173b19

 rsf-open-api/src/main/java/com/vincent/rsf/openApi/entity/phyz/MatPreparationOrder.java

@@ -25,6 +25,11 @@
    // 备料类型，为备料单时有，1 正常领料；2 生产补料；
    @JsonProperty("prepareType")
    private Integer prepareType;

    // 是否需要出库
    @JsonProperty("out")
    private Boolean out;

    // 备料详情
    private List<MatPreparationOrderItem> orderItems;
}