From d1099b48aecf383fcefbe7b5a7ac3c2de0f0793f Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期三, 06 十一月 2024 23:22:03 +0800
Subject: [PATCH] 1、卧理进出片功能已完成开发,与电气调试中,新增磨边队列表 2、卧理新增历史任务表,记录卧理两台设备执行过的历史数据 3、大理片笼opc任务,新增玻璃进笼计算方式:在笼内存储同炉的多片玻璃,笼内玻璃顺序可不按照固定的顺序进笼 4、上片任务初步完成开发,新增历史任务表记录上片的历史信息

---
 hangzhoumesParent/common/springsecurity/src/main/java/com/mes/userinfo/controller/SysUserController.java |    4 +---
 1 files changed, 1 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 6f13e7c..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());
@@ -61,10 +60,9 @@
     @PostMapping("/updateUser")
 //    @PreAuthorize("hasAuthority('sys:user:update')")
     public Result<List<SysUserVO>> updateUser(@Validated @RequestBody SysUserVO sysUser) {
-        //return Result.success(sysUserService.updateUser(sysUser));
         sysUserService.updateUser(sysUser);
         GeneralRequest request=new GeneralRequest();
-        request.setKey("");
+        //request.setKey("");
         return Result.success(sysUserService.listByUserName(request));
         //鏇存敼浜嗕慨鏀逛箣鍚庤繑鍥炴墍鏈夌敤鎴峰垪琛�
     }

--
Gitblit v1.8.0