Merge remote-tracking branch 'origin/master'

huanghongfa

2021-04-16 ff37f2fed3c479e5c664e5bff0834e37f400eceb

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComStreetServiceImpl.java

@@ -55,7 +55,7 @@
        param.eq(ComStreetDO::getAreaCode, comStreetVO.getAreaCode());
        Integer integer = comStreetDAO.selectCount(param);
        if (integer > 0) {
            return R.fail("街道已经存在");
            return R.fail(500, "街道已经存在");
        }
        BeanUtils.copyProperties(comStreetVO, comStreetDO);
        int insert = comStreetDAO.insert(comStreetDO);
@@ -64,7 +64,7 @@
            BeanUtils.copyProperties(comStreetDO1, comStreetVO);
            return R.ok(comStreetVO);
        }
        return R.fail();
        return R.fail(500,"");
    }