From 57b8bd13007ef363e7fa2e50c284d3ddbeee2961 Mon Sep 17 00:00:00 2001
From: wang <3597712270@qq.com>
Date: 星期二, 21 五月 2024 14:25:09 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/HangZhouMes
---
hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/controller/BigStorageCageController.java | 14 ++++----------
1 files changed, 4 insertions(+), 10 deletions(-)
diff --git a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/controller/BigStorageCageController.java b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/controller/BigStorageCageController.java
index 2564546..a81873e 100644
--- a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/controller/BigStorageCageController.java
+++ b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/controller/BigStorageCageController.java
@@ -2,6 +2,7 @@
import com.mes.bigstorage.entity.BigStorageCage;
import com.mes.bigstorage.service.BigStorageCageService;
+import com.mes.utils.Result;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
@@ -27,17 +28,10 @@
@Autowired
private BigStorageCageService bigStorageCageService;
- //todo: 瀹炰緥浠ｇ爜 寰呭垹闄�
- @ApiOperation("娴嬭瘯")
- @GetMapping("/index")
- public String index() {
- return "hello world";
- }
-
- @ApiOperation("鐞嗙墖绗间俊鎭�")
+ @ApiOperation("鏌ヨ鐞嗙墖绗间俊鎭�")
@GetMapping("/bigStorageCage")
- public List<BigStorageCage> querybigStorageCageDetail() {
- return bigStorageCageService.querybigStorageCageDetail();
+ public Result querybigStorageCageDetail() {
+ return Result.build(200,"鏌ヨ鎴愬姛",bigStorageCageService.querybigStorageCageDetail());
}
}
--
Gitblit v1.8.0