From d739bfa5976e36ced26f906ab16f83c20c8cb27c Mon Sep 17 00:00:00 2001
From: xiaoxie <hotcoffie@163.com>
Date: 星期一, 23 五月 2022 09:44:21 +0800
Subject: [PATCH] 处理冲突
---
src/main/java/com/genersoft/iot/vmp/service/IUserService.java | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/service/IUserService.java b/src/main/java/com/genersoft/iot/vmp/service/IUserService.java
index 112af35..c170c02 100644
--- a/src/main/java/com/genersoft/iot/vmp/service/IUserService.java
+++ b/src/main/java/com/genersoft/iot/vmp/service/IUserService.java
@@ -12,11 +12,11 @@
User getUserByUsername(String username);
- void addUser(User user);
+ int addUser(User user);
- void deleteUser(int id);
+ int deleteUser(int id);
List<User> getAllUsers();
- void updateUsers(User user);
+ int updateUsers(User user);
}
--
Gitblit v1.8.0