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

skyouc

2025-04-30 6eec4237238688ada5cb86e7dab4f1b6273887f1

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

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

public interface WaitPakinService extends IService<WaitPakin> {

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

    WaitPakin unBind(WaitPakinParam param);
}