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

jinpengyong

2024-01-26 c21c161bc5ecddbe2a1d5174c2d178d768939e17

 screen-api/src/main/java/com/moral/api/service/impl/ServicesScopeServiceImpl.java

@@ -214,7 +214,6 @@
                        }
                    }
                    Map<String, Object> map = historyDataMap.get(near_mac);
                    System.out.println(near_mac);
                    if (map != null){
                        String value = map.get("value").toString();
                        JSONObject jsonObject = JSONObject.parseObject(value);