From 6c919937bd02d4289cbaf1fe7f4619c5e79358fa Mon Sep 17 00:00:00 2001
From: mk1990 <153958232@qq.com>
Date: 星期三, 22 六月 2022 14:42:46 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wvp-28181-2.0' into wvp-28181-2.0
---
src/main/java/com/genersoft/iot/vmp/storager/dao/RoleMapper.java | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/storager/dao/RoleMapper.java b/src/main/java/com/genersoft/iot/vmp/storager/dao/RoleMapper.java
index be20a69..66a60b9 100644
--- a/src/main/java/com/genersoft/iot/vmp/storager/dao/RoleMapper.java
+++ b/src/main/java/com/genersoft/iot/vmp/storager/dao/RoleMapper.java
@@ -11,12 +11,12 @@
@Repository
public interface RoleMapper {
- @Insert("INSERT INTO role (name, authority, createTime, updateTime) VALUES" +
+ @Insert("INSERT INTO user_role (name, authority, createTime, updateTime) VALUES" +
"('${name}', '${authority}', '${createTime}', '${updateTime}')")
int add(Role role);
@Update(value = {" <script>" +
- "UPDATE role " +
+ "UPDATE user_role " +
"SET updateTime='${updateTime}' " +
"<if test=\"name != null\">, name='${name}'</if>" +
"<if test=\"authority != null\">, authority='${authority}'</if>" +
@@ -24,12 +24,12 @@
" </script>"})
int update(Role role);
- @Delete("DELETE FROM role WHERE id != 1 and id=#{id}")
+ @Delete("DELETE FROM user_role WHERE id != 1 and id=#{id}")
int delete(int id);
- @Select("select * FROM role WHERE id=#{id}")
+ @Select("select * FROM user_role WHERE id=#{id}")
Role selectById(int id);
- @Select("select * FROM role")
+ @Select("select * FROM user_role")
List<Role> selectAll();
}
--
Gitblit v1.8.0