Merge remote-tracking branch 'origin/test' into test

huanghongfa

2021-05-19 14590de8e4fb23909f1767a53d1f92007f9bbcc4

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ConvenientApi.java

@@ -84,12 +84,11 @@
     * 查询便民服务商家详情
     *
     * @param id 商家主键
     * @param cityCode 城市编码
     * @return 返回结果
     */
    @GetMapping("/business/get")
    public R getComCvtBusiness(@RequestParam("id") Long id, @RequestParam("cityCode") String cityCode) {
        return comCvtBusinessService.getComCvtBusiness(id, cityCode);
    public R getComCvtBusiness(@RequestParam("id") Long id) {
        return comCvtBusinessService.getComCvtBusiness(id);
    }

    /**