Merge branch 'devlop' into devlop_whxrwms

skyouc

6 天以前 da0fd7be060ab4a0225c70c6572b2947484a2cb1

 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
     */