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

cjl

2023-07-24 72b62513dbb8621658628a07001c5a159c130738

 screen-api/src/main/java/com/moral/api/service/HistoryFiveMinutelyService.java

@@ -47,6 +47,6 @@
            * @Author: 陈凯裕
            * @Date: 2022/3/10
            */
    Map<String,Object> getPopDataByMac(String mac);
    Map<String,Object> getPopDataByMac(Map<String, Object> params);

}