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

cjl

2023-08-09 83e42707519f5e2d886618ea55c30e8c3ab381ac

 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);