Merge remote-tracking branch 'origin/main-dev' into main-dev

648540858

2024-02-07 562dbb0857e4e6f7a250d69752270c0c165d5141

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

old mode 100644
new mode 100755
@@ -25,5 +25,5 @@

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

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