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

lbq

2 天以前 b1a281bc282070f78ca5dff42fc74188bfc9e9c7

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

@@ -8,7 +8,7 @@
@ApiModel(value = "OrderOutTaskParam", description = "订单出库param")
public class OrderOutTaskParam implements Serializable {

    private String waveId;
    private Long waveId;

    private Long orderId;