Merge branch 'local_20221104' into huacheng_test

yanghui

2022-11-17 6e907cce72e42a349123800d697aa99f3360783e

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

@@ -31,6 +31,19 @@
            PageConvenientGoodsCategoryDTO pageConvenientGoodsCategoryDTO);

    /**
     * 创建商品、分类关系
     * @param id
     * @param goodsId
     * @param goodsCategoryId
     * @param goodsCategoryName
     * @param createdBy
     * @return
     */
    int createGoodsCategoryRelation(@Param("id")Long id,@Param("goodsId") Long goodsId, @Param("goodsCategoryId") Long goodsCategoryId,
                                      @Param("goodsCategoryName") String goodsCategoryName, @Param("createdBy") Long createdBy);


    /**
     * 删除商家服务类型关系
     * @param goodsId
     * @return