Merge branch 'devlop' into devlop_whxrwms

skyouc

6 天以前 da0fd7be060ab4a0225c70c6572b2947484a2cb1

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

@@ -20,13 +20,12 @@
    @TableId(value = "id", type = IdType.AUTO)
    private Long id;

    @ApiModelProperty("单据类型：in: 入库， out:出库")
    private String type;

    @ApiModelProperty("调拔单ID")
    private Long transferId;

    @ApiModelProperty("订单ID")
    private Long orderId;

    @ApiModelProperty("执行状态")
    private Integer exceStatus;

}