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

cjl

2023-11-02 a0a6f95ec5b92be03385eea83b64bf97fcbfa17e

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

@@ -144,7 +144,7 @@
        if (!params.containsKey("macs") || !params.containsKey("sensorCode") || !params.containsKey("type") || !params.containsKey("times")) {
            return ResultMessage.fail(ResponseCodeEnum.PARAMETERS_IS_MISSING.getCode(), ResponseCodeEnum.PARAMETERS_IS_MISSING.getMsg());
        }
        List<Map<String, Object>> response = deviceService.getTrendChartData(params);
        List<Map<String, Object>> response = deviceService.getTrendChartDataV2(params);
        return ResultMessage.ok(response);
    }
}