From dfb87c768538e280cf5e17d1d5ee5bbed1e1888d Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期五, 25 十一月 2022 10:58:26 +0800
Subject: [PATCH] 合并主线
---
src/main/java/com/genersoft/iot/vmp/storager/dao/UserMapper.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/storager/dao/UserMapper.java b/src/main/java/com/genersoft/iot/vmp/storager/dao/UserMapper.java
index 57d2fdc..c7a44fd 100644
--- a/src/main/java/com/genersoft/iot/vmp/storager/dao/UserMapper.java
+++ b/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);
}
--
Gitblit v1.8.0