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

zjj

2025-04-28 b69b63a09089566b0b2505fbc39a673c3e18785f

 rsf-server/src/main/java/com/vincent/rsf/server/manager/service/WaitPakinService.java

@@ -6,5 +6,7 @@

public interface WaitPakinService extends IService<WaitPakin> {

    WaitPakin mergeItems(WaitPakinParam waitPakin);
    WaitPakin mergeItems(WaitPakinParam waitPakin, Long userId);

    WaitPakin unBind(WaitPakinParam param);
}