From a5ebb9545a1fdc78f6c1c285ce4f6c7a37b9e749 Mon Sep 17 00:00:00 2001
From: 罗元桥 <2376770955@qq.com>
Date: 星期一, 27 九月 2021 14:21:19 +0800
Subject: [PATCH] Merge branch 'test_bak' into 'master'

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

diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ConvenientProductCategoryDAO.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ConvenientProductCategoryDAO.java
index b2bdb03..32e5f94 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ConvenientProductCategoryDAO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ConvenientProductCategoryDAO.java
@@ -32,6 +32,7 @@
     /**
      * 查询所有分类
      * @return
+     * @param merchantId
      */
-    List<ConvenientProductCategoryVO> selectAllCategories();
+    List<ConvenientProductCategoryVO> selectAllCategories(@Param("merchantId") Long merchantId);
 }

--
Gitblit v1.7.1