Merge branch 'test' into 'master'

罗元桥

2021-07-15 d2baab8c43dca88365dac6e98a95ceee644001e2

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

@@ -150,8 +150,8 @@
        }
        ComMngVolunteerMngVO comMngVolunteerMngVO=new ComMngVolunteerMngVO();
        BeanUtils.copyProperties(comMngVolunteerMngDO,comMngVolunteerMngVO);
        String phone = comMngVolunteerMngVO.getPhone();
        comMngVolunteerMngVO.setUserId(comMngVolunteerMngDAO.selectUserIdByPhone(phone));
        //String phone = comMngVolunteerMngVO.getPhone();
        //comMngVolunteerMngVO.setUserId(comMngVolunteerMngDAO.selectUserIdByPhone(phone));
        return R.ok(comMngVolunteerMngVO);
    }