Merge remote-tracking branch 'origin/master'

mrzcc

2020-02-10 4f9c122f237fbee16d5ef9c602b6db95d28ed7b0

 UserService/src/main/java/com/java110/user/smo/impl/UserInnerServiceSMOImpl.java

@@ -90,6 +90,15 @@
        return staffs;
    }

    @Override
    public List<UserDto> getUserHasPwd(@RequestBody UserDto userDto) {
        //校验是否传了 分页信息
        List<UserDto> staffs = BeanConvertUtil.covertBeanList(userServiceDaoImpl.getUserHasPwd(BeanConvertUtil.beanCovertMap(userDto)), UserDto.class);

        return staffs;

    }

    private void freshUserAttrs(List<UserDto> userDtos) {

        Map param = null;