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

zhou zhou

23 小时以前 757a5a1373c96d216be9eb5d6b5cd6374ce95deb

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

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

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

    WaitPakin unBind(WaitPakinParam param);