Merge branch 'haucheng_panzhihua' into huacheng_test

101captain

2022-08-08 0738bc12a588778c40c21a1874048c485f360ce1

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ConvenientServiceCategoryDAO.java

@@ -37,7 +37,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);

    /**