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

jinpengyong

2023-08-04 b5a2fc07527ab700544f3b7ba0be01b2e015e2db

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

}