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

648540858

2022-09-07 60c4f767f094d15711aa48b19b4e05e65999625a

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