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

chen.lin

1 天以前 a488088a18a9b8808bc57124681cee8c4ada7299

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

@@ -147,6 +147,12 @@
    @ApiModelProperty(value= "指定站点")
    private String stationId;

    /**
     * 指定库位
     */
    @ApiModelProperty(value= "指定库位")
    private String locCode;

    public Wave() {}

    public Wave(String code,Short type,Short exceStatus,Double anfme,Double qty,Integer orderNum,Integer status,Long tenantId,Date createTime,Long createBy,Date updateTime,Long updateBy,Integer deleted,String memo) {