Merge remote-tracking branch 'origin/devlop_whxrwms' into devlop_whxrwms

skyouc

5 天以前 3f2b778ab3fbee3d851ed7033451cc008366ab4b

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