Merge branch 'test' into 'test_bak'

罗元桥

2021-09-27 abb4fd4a8696417382225c3f3ac5518fa435547c

 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);
}