From 768e16999a8ce4bb500490ee76c659aa61ea1783 Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期二, 25 三月 2025 10:08:13 +0800
Subject: [PATCH] Merge branch 'master' of http://bore.pub:10439/r/ERP_override
---
north-glass-erp/src/main/java/com/example/erp/controller/userInfo/UserController.java | 15 ++++++++++++++-
1 files changed, 14 insertions(+), 1 deletions(-)
diff --git a/north-glass-erp/src/main/java/com/example/erp/controller/userInfo/UserController.java b/north-glass-erp/src/main/java/com/example/erp/controller/userInfo/UserController.java
index fafcdf5..3f0c820 100644
--- a/north-glass-erp/src/main/java/com/example/erp/controller/userInfo/UserController.java
+++ b/north-glass-erp/src/main/java/com/example/erp/controller/userInfo/UserController.java
@@ -13,6 +13,8 @@
import org.springframework.web.bind.annotation.*;
import java.util.List;
+import java.util.Map;
+
@RestController //娉ㄨВuser鎺у埗鍣紝鎸傝浇鍒皊pringboot褰撲腑
@RequestMapping("/user") //娉ㄨВ鍓嶇寮傛璇锋眰濡傦細localhost锛�8080/user
public class UserController {
@@ -28,7 +30,6 @@
@GetMapping
public List<User> getUser(){
- System.out.println(cacheUtil.getCacheData("admin"));
return userMapper.findAll();
}
@ApiOperation("鐧诲綍")
@@ -55,4 +56,16 @@
//return
}
+ @ApiOperation("淇敼瀵嗙爜")
+ @PostMapping("/updatePassWord")
+ public Result updatePassWord(@RequestBody Map<String,Object> object){
+ return Result.seccess( userService.updatePassWord(object));
+ }
+
+ @ApiOperation("淇敼鐢ㄦ埛鍚�")
+ @PostMapping("/updateUserName")
+ public Result updateUserName(@RequestBody Map<String,Object> object){
+ return Result.seccess( userService.updateUserName(object));
+ }
+
}
--
Gitblit v1.8.0