支付参数2

cash-common/cash-common-service/src/main/java/com/czg/order/service/ShopMerchantService.java

@@ -8,8 +8,6 @@ import com.mybatisflex.core.service.IService;
 import jakarta.validation.constraints.NotBlank;
 import jakarta.validation.constraints.NotNull;
 
-import java.io.Serializable;
-
 /**
  * 第三方商户进件 服务层。
  *
@@ -32,8 +30,7 @@ public interface ShopMerchantService extends IService<ShopMerchant> {
      */
     void upMerchant(@NotBlank String relatedLicenceNo, @NotNull NativeMerchantDTO nativeMerchantDTO);
 
-    @Override
-    ShopMerchant getById(Serializable id);
+    ShopMerchant getById(Long shopId);
 
 
     ShopDirectMerchant getMainMerchant(Long shopId);