Merge branch '648540858:wvp-28181-2.0' into wvp-28181-2.0

mrjackwang

2022-07-20 8d87741dea3d174f098269073429a0f6b982baa1

 src/main/java/com/genersoft/iot/vmp/service/IUserService.java

@@ -25,5 +25,5 @@

    PageInfo<User> getUsers(int page, int count);

    int resetPushKey(int id);
    int changePushKey(int id, String pushKey);
}