From 889ff0512bc68be0f5d231a524bf97c9488ec37f Mon Sep 17 00:00:00 2001
From: wuyouming666 <2265557248@qq.com>
Date: 星期四, 16 五月 2024 16:13:20 +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 | 17 +++++++++--------
1 files changed, 9 insertions(+), 8 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 57b043d..984060f 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
@@ -29,6 +29,7 @@
private UpWorkstationService upWorkstationService;
@ApiOperation("鏄剧ず宸ヤ綅涓婄殑鐜荤拑淇℃伅")
@GetMapping("/list") //鏌ヨ鐜板湪涓婄墖鏈虹殑鐜荤拑淇℃伅
+ @ResponseBody
public Result<List<UpWorkstation>> list() {
List<UpWorkstation> glass = upWorkstationService.list();
log.info("鏄剧ず宸ヤ綅涓婄殑鐜荤拑淇℃伅:{}", glass);
@@ -45,14 +46,14 @@
return Result.build(200, "", upwork);
}
- @ApiOperation("寮�濮嬩笂鐗囦换鍔�")
- @PostMapping("/selectPriority") //璋冪敤涓婄墖浠诲姟
- @ResponseBody
- public void selectPriority() {
- UpWorkSequence work=upWorkstationService.selectPriority();
- log.info("鏄剧ず鍙笂鐨勭幓鐠冧俊鎭�:{}", work);
-
- }
+// @ApiOperation("寮�濮嬩笂鐗囦换鍔�")
+// @PostMapping("/selectPriority") //璋冪敤涓婄墖浠诲姟
+// @ResponseBody
+// public void selectPriority() {
+// UpWorkSequence work=upWorkstationService.selectPriority();
+// log.info("鏄剧ず鍙笂鐨勭幓鐠冧俊鎭�:{}", work);
+//
+// }
}
--
Gitblit v1.8.0