修复合并的bug

648540858

2022-11-29 38a85d432ae9bb861dbcbf090d68fb3dca0d85f6

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