Merge branch 'acid_push' into huacheng_test

zhaozhengjie

2022-09-16 702aaf26da08f4a9576377bb5196aba5073e0637

 springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java

@@ -3668,6 +3668,15 @@
        return R.ok();
    }

    @Override
    public R accept(Long userId) {
        SysUserDO sysUserDO=new SysUserDO();
        sysUserDO.setUserId(userId);
        sysUserDO.setIsAccept(1);
        userDao.updateById(sysUserDO);
        return R.ok();
    }


    @Override
    public R getAreaAndStreet() {