Merge branch 'devlop' of http://47.97.1.152:5880/r/wms-master into devlop

skyouc

5 天以前 50c33b34f9e6ae19c003d305e4c0b86cea062bec

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

@@ -223,15 +223,6 @@
    @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
    private Date updateTime;

//    @TableField(exist = false)
//    private Long waveId;
//
//    @TableField(exist = false)
//    private Long waveItemId;
//
//    @TableField(exist = false)
//    private String waveCode;

    @TableField(exist = false)
    private Long sourceId;