Merge branch 'local_20221104' into huacheng_test

yanghui

2022-11-18 0e7584f11e1da29ce07f5f21048197dd155f1574

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

@@ -10651,7 +10651,7 @@
     * @param operator
     * @return
     */
    @DeleteMapping("/point/delete")
    @DeleteMapping("/convenient/point/delete")
    R deletePoint(@RequestParam("pointId") Long pointId, @RequestParam("operator") Long operator);

    /**
@@ -10659,7 +10659,7 @@
     * @param pointId
     * @return
     */
    @GetMapping("/point/detail")
    @GetMapping("/convenient/point/detail")
    R detailPoint(@RequestParam("pointId") Long pointId);

    /**
@@ -10667,7 +10667,7 @@
     * @param convenientGoodsCategoryDTO
     * @return
     */
    @PostMapping("/goodsCategory/add")
    @PostMapping("/convenient/goodsCategory/add")
    R addGoodsCategory(@RequestBody ConvenientGoodsCategoryDTO convenientGoodsCategoryDTO);

    /**
@@ -10675,7 +10675,7 @@
     * @param convenientGoodsCategoryDTO
     * @return
     */
    @PutMapping("/goodsCategory/put")
    @PutMapping("/convenient/goodsCategory/put")
    R putGoodsCategory(@RequestBody ConvenientGoodsCategoryDTO convenientGoodsCategoryDTO);

    /**
@@ -10683,7 +10683,7 @@
     * @param categoryId
     * @return
     */
    @DeleteMapping("/goodsCategory/delete")
    @DeleteMapping("/convenient/goodsCategory/delete")
    R deleteGoodsCategory(@RequestParam("categoryId") Long categoryId, @RequestParam("operator") Long operator);

    /**
@@ -10691,7 +10691,7 @@
     * @param categoryId
     * @return
     */
    @GetMapping("/goodsCategory/get")
    @GetMapping("/convenient/goodsCategory/get")
    R getGoodsCategory(@RequestParam("categoryId") Long categoryId);

    /**
@@ -10699,7 +10699,7 @@
     * @param pageConvenientGoodsCategoryDTO
     * @return
     */
    @PostMapping("/goodsCategory/page")
    @PostMapping("/convenient/goodsCategory/page")
     R pageGoodsCategory(@RequestBody PageConvenientGoodsCategoryDTO pageConvenientGoodsCategoryDTO);

    @GetMapping("/dataCount")
@@ -10718,7 +10718,7 @@
     * 获取所有商品分类
     * @return
     */
    @GetMapping("/goodsCategory/getAllGoodsCategories")
    @GetMapping("/convenient/goodsCategory/getAllGoodsCategories")
    R getAllGoodsCategories();

    /**