From 025ce634be776644180b7f1f361b5533a063a230 Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期二, 07 五月 2024 21:37:25 +0800
Subject: [PATCH] fixbug:代码被后续提交覆盖代码恢复 移除maven工具包 新增定时任务 忽略日志文件 新增日志输入 Merge branch 'security 20240424' 权限管理开发基本功能已完成,待前端对接
---
hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/taskcache/controller/TaskCacheController.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/taskcache/controller/TaskCacheController.java b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/taskcache/controller/TaskCacheController.java
index fae360b..85e1ef5 100644
--- a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/taskcache/controller/TaskCacheController.java
+++ b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/taskcache/controller/TaskCacheController.java
@@ -39,14 +39,14 @@
@PostMapping("/cutTerritory")
@ResponseBody
public Result cutTerritory(String current) {
- List<OptimizeDetail> h = edgStorageCageDetailsService.selectCurrentCutTerritory(current);
+ List<Map<String, Object>> h = edgStorageCageDetailsService.selectCurrentCutTerritory(current);
return Result.build(200,"鎴愬姛",h);
}
@ApiOperation("璇嗗埆鏄剧ず 褰撳墠鐗堝浘 鍙傛暟()")
@PostMapping("/currentCutTerritory")
@ResponseBody
public Result currentCutTerritory() {
- List<OptimizeDetail> h = edgStorageCageDetailsService.selectCutTerritory();
+ List<Map<String, Object>> h = edgStorageCageDetailsService.selectCutTerritory();
return Result.build(200,"鎴愬姛",h);
}
@ApiOperation("璇嗗埆鎿嶄綔锛� 鐮存崯/鎷胯蛋 鍙傛暟锛圛D,鍔熻兘[200锛氭嬁璧帮紝201:鐮存崯]锛�")
--
Gitblit v1.8.0