From ad28331c1e3ed456b72765874b41b83b49dc279f Mon Sep 17 00:00:00 2001 From: 严智鑫 <test> Date: 星期四, 18 四月 2024 14:44:11 +0800 Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/HangZhouMes --- hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/workstation/controller/UpWorkstationController.java | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/workstation/controller/UpWorkstationController.java b/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/workstation/controller/UpWorkstationController.java index 6e206ee..9a4e2c8 100644 --- a/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/workstation/controller/UpWorkstationController.java +++ b/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/workstation/controller/UpWorkstationController.java @@ -1,15 +1,15 @@ package com.mes.workstation.controller; +import com.mes.utils.Result; import com.mes.workstation.entity.GlassInfo; import com.mes.workstation.entity.UpWorkstation; import com.mes.workstation.service.UpWorkstationService; -import com.mes.utils.Result; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; -import com.mes.glassinfo.entity.UpPattenUsage; + import java.util.List; /** @@ -43,7 +43,6 @@ public void updateGlassMessage(@RequestBody UpWorkstation upwork) { upWorkstationService.updateGlassMessage(upwork); } - @ApiOperation("寮�濮嬩笂鐗囦换鍔�") @PostMapping("/selectPriority") //寮�濮嬩笂鐗囦换鍔� -- Gitblit v1.8.0