Merge remote-tracking branch 'origin/wvp-dialog' into wvp-dialog

648540858

2022-09-23 2ea1bc8ae165d89fe5fb27bff776ed80798a861a

 src/main/java/com/genersoft/iot/vmp/storager/dao/UserMapper.java

@@ -60,6 +60,6 @@
    @ResultMap(value="roleMap")
    List<User> getUsers();

    @Delete("update user set pushKey=MD5(NOW()+#{id}) where id=#{id}")
    int resetPushKey(int id);
    @Update("update user set pushKey=#{pushKey} where id=#{id}")
    int changePushKey(int id, String pushKey);
}