Merge remote-tracking branch 'origin/wvp-28181-2.0' into wvp-28181-2.0

gushouzheng

2022-08-06 d21d281b2c4020bcbfc72bd95a458084a109933a

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