Merge branch 'dev' of http://blit.7drlb.com:8888/r/moral into dev

chenxi

2023-05-27 76cee9b52e3811dca3f4481610bd0835cbd45c6f

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

}