Merge remote-tracking branch 'origin/dev' into dev

cjl

2023-07-19 43c631ad573535f4434caf19423824d4bd3f8ca7

 screen-api/src/main/java/com/moral/api/controller/HistoryHourlyController.java

@@ -100,7 +100,7 @@
        return ResultMessage.ok(resultList);
    }

    @RequestMapping(value = "getHourCompleteDataByMacSensorCodeDate2", method = RequestMethod.GET)
    @RequestMapping(value = "test2", method = RequestMethod.GET)
    @ResponseBody
    public ResultMessage test2(HttpServletRequest request){
        Map<String, Object> parameters = WebUtils.getParametersStartingWith(request,null);