Merge remote-tracking branch 'origin/master'

CeDo

2021-04-12 c3ce38cb41d4e4a7d036576b7be52ec2d8c3e724

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

@@ -33,8 +33,7 @@
    @PostMapping("addstreet")
    @Transactional(rollbackFor = Exception.class)
    public R addStreet(@RequestBody ComStreetVO comStreetVO) {
        R r = comStreetService.addStreet(comStreetVO);
        return R.ok(r);
        return comStreetService.addStreet(comStreetVO);
    }

    /**