From 70d2a5d0f9c6951b2d4cac954041ed73582ff7eb Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期一, 09 六月 2025 11:54:00 +0800
Subject: [PATCH] 6.9新增登录失败冻结逻辑

---
 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ConvenientServiceCategoryDAO.java |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ConvenientServiceCategoryDAO.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ConvenientServiceCategoryDAO.java
index 658fb8d..339cd5f 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ConvenientServiceCategoryDAO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ConvenientServiceCategoryDAO.java
@@ -26,7 +26,8 @@
      * @param pageConvenientServiceCategoryDTO
      * @return 服务分类详情
      */
-    IPage<ConvenientServiceCategoryVO> pageServiceCategory(@Param("page") Page page, @Param("pageConvenientServiceCategoryDTO")
+    IPage<ConvenientServiceCategoryVO> pageServiceCategory(@Param("page") Page page,
+                                                           @Param("pageConvenientServiceCategoryDTO")
                                                            PageConvenientServiceCategoryDTO pageConvenientServiceCategoryDTO);
 
     /**
@@ -37,7 +38,7 @@
      * @param createdBy
      * @return
      */
-    int createMerchantServiceRelation(@Param("merchantId") Long merchantId, @Param("serviceId") Long serviceId,
+    int createMerchantServiceRelation(@Param("id")Long id,@Param("merchantId") Long merchantId, @Param("serviceId") Long serviceId,
                                       @Param("name") String name, @Param("createdBy") Long createdBy);
 
     /**
@@ -59,7 +60,7 @@
      * @param merchantId
      * @return serviceIds
      */
-    List<Long> selectServiceIdsForMerchant(@Param("merchantId") Long merchantId);
+    List<String> selectServiceIdsForMerchant(@Param("merchantId") Long merchantId);
 
     /**
      * 查看服务分类是否被引用

--
Gitblit v1.7.1