Merge branch 'local_20221104' into huacheng_test

yanghui

2022-11-09 855443a0f7c5ed7b2c04b3b44d825a185802e7a9

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java

@@ -10513,6 +10513,13 @@
    @DeleteMapping("/point/delete")
    R deletePoint(@RequestParam("pointId") Long pointId, @RequestParam("operator") Long operator);

    /**
     * 便民服务详情 自提点
     * @param pointId
     * @return
     */
    @GetMapping("/point/detail")
    R detailPoint(@RequestParam("pointId") Long pointId);

    /**
     * 新增商品分类
@@ -10553,4 +10560,10 @@
     */
    @PostMapping("/goodsCategory/page")
     R pageGoodsCategory(@RequestBody PageConvenientGoodsCategoryDTO pageConvenientGoodsCategoryDTO);

    @GetMapping("/dataCount")
    R dataCount();

    @DeleteMapping("/proceedings/remove")
    R removeProceedings(@RequestParam("id") Long id);
}