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

skyouc

14 小时以前 c255a17d7ef4fabb37c1ac84b212768e73c42915

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

@@ -40,6 +40,9 @@
    @TableId(value = "id", type = IdType.AUTO)
    private Long id;

    @ApiModelProperty("日志主单ID")
    private Long logId;

    /**
     * 主单ID
     */
@@ -140,6 +143,7 @@
     * 是否删除 1: 是  0: 否  
     */
    @ApiModelProperty(value= "是否删除 1: 是  0: 否  ")
    @TableLogic
    private Integer deleted;

    /**