Merge branch 'wvp-28181-2.0'

648540858

2022-08-15 cb16cabb64e99d7f505822a49665725ff5b61ff6

 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);
    }
}