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

648540858

2022-09-16 1ee56d50d871ed0adb2d3b39600653945e34bb23

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