From eaf25c57276ebaf28141418199c92e9502884ccf Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期日, 09 三月 2025 23:51:28 +0800
Subject: [PATCH] 1、原片仓储新增任务完成/任务失败接口供用户异常情况恢复处理 2、原片仓储新增历史任务查询按钮 3、卧式理片新增任务完成/任务失败接口供用户异常情况恢复处理 4、大理片笼临时修改:10mm及以上厚度的玻璃走直通任务,厚度可按照实际情况进行配置 5、fixbug:中空理片笼10mm厚度玻璃进入理片笼小格子异常问题查询,同一个流程卡同一层出现2种厚度,导致厚度赋值异常,目前已改为查询最后一次导入的为准

---
 hangzhoumesParent/common/springsecurity/src/main/java/com/mes/userinfo/controller/SysUserController.java |    6 ++----
 1 files changed, 2 insertions(+), 4 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..a380ddf 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
@@ -27,7 +27,7 @@
  * @author zhoush
  * @since 2024-04-11
  */
-@Api(description = "鐢ㄦ埛绠$悊")
+@Api(tags = "鐢ㄦ埛绠$悊")
 @RestController
 @RequestMapping("/sys/user")
 public class SysUserController {
@@ -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