Merge branch 'wvp-28181-2.0'

648540858

2022-08-09 8b0ff3767b23f9479a0b3ebe8e343ed6470bd194

 src/main/java/com/genersoft/iot/vmp/service/impl/UserServiceImpl.java

@@ -75,7 +75,7 @@
    }

    @Override
    public int resetPushKey(int id) {
        return userMapper.resetPushKey(id);
    public int changePushKey(int id, String pushKey) {
        return userMapper.changePushKey(id,pushKey);
    }
}