From 1393ec7b94738419acbfd340cf24d3debaa2b73e Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Fri, 21 Jul 2023 15:53:13 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/cjl' into qa
---
screen-api/src/main/java/com/moral/api/controller/HistoryHourlyController.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/screen-api/src/main/java/com/moral/api/controller/HistoryHourlyController.java b/screen-api/src/main/java/com/moral/api/controller/HistoryHourlyController.java
index d69ad0c..d0b826f 100644
--- a/screen-api/src/main/java/com/moral/api/controller/HistoryHourlyController.java
+++ b/screen-api/src/main/java/com/moral/api/controller/HistoryHourlyController.java
@@ -100,9 +100,9 @@
return ResultMessage.ok(resultList);
}
- @RequestMapping(value = "getHourCompleteDataByMacSensorCodeDate2", method = RequestMethod.GET)
+ @RequestMapping(value = "test2", method = RequestMethod.GET)
@ResponseBody
- public ResultMessage getHourCompleteDataByMacSensorCodeDate2(HttpServletRequest request){
+ public ResultMessage test2(HttpServletRequest request){
Map<String, Object> parameters = WebUtils.getParametersStartingWith(request,null);
Object mac = parameters.get("mac");
Object sensorCode = parameters.get("sensor_code");
--
Gitblit v1.8.0