Merge branch 'test' into 'test_bak'

罗元桥

2021-09-27 e8cd3a0632a11f53844018507d80579b04addb24

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

@@ -3154,7 +3154,7 @@
     * @return 删除结果
     */
    @PostMapping("common/data/special/delete")
    R deleteSpecialInputUser(@RequestParam(value = "id") Long id);
    R deleteSpecialInputUser(@RequestParam(value = "id") Long id,@RequestParam("communityId") Long communityId);

    /**
     * 办事指南_新增
@@ -6318,9 +6318,10 @@
    /**
     * 获取所有产品分类
     * @return
     * @param merchantId
     */
    @GetMapping("/convenient/product-category/all")
    R getAllProductCategory();
    R getAllProductCategory(@RequestParam("merchantId") Long merchantId);

    /**
     * 获取该社区商家数量大于0的分类