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

lbq

4 天以前 11db152ac1ee3d47e1047fb0c96fc7e10da345ac

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

@@ -10,6 +10,7 @@
public interface WaitPakinService extends IService<WaitPakin> {

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

    WaitPakin unBind(WaitPakinParam param);