From 0926a39aef0c9fdcee823e189bac2e532c6f0d4b Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期日, 20 十月 2024 21:06:51 +0800
Subject: [PATCH] 1、对接原片仓储opc 2、关闭liquibase，仅需要有脚本变动的时候开启在执行，避免启动报错 3、原片仓储新增入库请求、出库情况，调整整体逻辑，增加格子号架子号，任务表、详情表、工位表都需要记录架子信息，用于任务执行过程中，架子在执行过程中可返回架子对应的工位上，避免架子乱放后格子架子号不对应的情况发生。
---
hangzhoumesParent/common/springsecurity/src/main/java/com/mes/userinfo/controller/SysUserController.java | 9 ++++++---
1 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/hangzhoumesParent/common/springsecurity/src/main/java/com/mes/userinfo/controller/SysUserController.java b/hangzhoumesParent/common/springsecurity/src/main/java/com/mes/userinfo/controller/SysUserController.java
index 2e0f357..e897e65 100644
--- a/hangzhoumesParent/common/springsecurity/src/main/java/com/mes/userinfo/controller/SysUserController.java
+++ b/hangzhoumesParent/common/springsecurity/src/main/java/com/mes/userinfo/controller/SysUserController.java
@@ -43,7 +43,6 @@
@ApiOperation("閫�鍑虹櫥褰�")
@PostMapping("/logout")
-// @PreAuthorize("hasRole('ROLE_admin')")
@PreAuthorize("hasAuthority('xt:yh')")
public Result<String> logout() {
return Result.success(sysUserService.logout());
@@ -60,8 +59,12 @@
@ApiOperation("鏇存柊鐢ㄦ埛淇℃伅")
@PostMapping("/updateUser")
// @PreAuthorize("hasAuthority('sys:user:update')")
- public Result<SysUserVO> updateUser(@Validated @RequestBody SysUserVO sysUser) {
- return Result.success(sysUserService.updateUser(sysUser));
+ public Result<List<SysUserVO>> updateUser(@Validated @RequestBody SysUserVO sysUser) {
+ sysUserService.updateUser(sysUser);
+ GeneralRequest request=new GeneralRequest();
+ //request.setKey("");
+ return Result.success(sysUserService.listByUserName(request));
+ //鏇存敼浜嗕慨鏀逛箣鍚庤繑鍥炴墍鏈夌敤鎴峰垪琛�
}
@ApiOperation("閲嶇疆瀵嗙爜")
--
Gitblit v1.8.0